diff --git a/.gitignore b/.gitignore
index 686cfcb..a1082e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ local.properties
 .project
 
 .DS_Store
+.vs
 /node_modules/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 420e6f2..e437a26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1,73 @@
 # Change Log
+
+Update 2013/08/05
+=================
+
+Hi, you are all probably wondering where the code is after seeing my PhoneGap Day US presentation or reading the slides.
+Well, I've been dealing with an illness in the family and have not had as much spare time as I would have hoped to update this project.
+However, things are working out better than I could have hoped for and I should have time to concentrate on this very soon.
+
+Update 2013/09/05
+=================
+
+Back to work on this but it's not ready yet so don't try to use.
+
+Update 2015/04/04
+=================
+
+Basic example is working on iOS and android
+```
+<script type="text/javascript">
+var recognition;
+document.addEventListener('deviceready', onDeviceReady, false);
+
+function onDeviceReady() {
+    recognition = new SpeechRecognition();
+    recognition.onresult = function(event) {
+        if (event.results.length > 0) {
+            q.value = event.results[0][0].transcript;
+            q.form.submit();
+        }
+    }
+}
+</script>
+<form action="http://www.example.com/search">
+    <input type="search" id="q" name="q" size=60>
+    <input type="button" value="Click to Speak" onclick="recognition.start()">
+</form>
+```
+
+Example from section 6.1 Speech Recognition Examples of the W3C page
+(https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html#examples)
+
+Update 2018/05/30
+=================
+
+Improved compatibility with the W3C specification (https://w3c.github.io/speech-api/webspeechapi.html) and other improvements.
+* Result events are returned as `SpeechRecognitionResult` objects with the content matching the spec.
+* Error events are returned as `SpeechRecognitionError` objects.
+* Improved error reporting for Android.
+* Added support for interim results for Android.
+* Added support for more of the speech recognition events for iOS.
+* Added support for the `config.xml` preference, `speechRecognitionAllowAudioOutput` to allow iOS apps to also output audio when using this plugin.
+* Added ability to disable use of the iSpeech SDK for iOS using `speechRecognitionApiKey` preference.
+* The `speechRecognitionApiKey` preference now replaces the original `apiKey` preference.
+
+
+Update 2019/01/21
+=================
+
+* Improvements to error handling for Android
+* Added support for "local" serviceURI for Android indicate a preference for offline (local) recognition.
+* Fix to iOS support to allow for use of a Bluetooth Headset.
+* Removed support for iSpeechSDK for iOS. Now requires iOS 10 or newer.
+
+Update 2019/03/13
+=================
+
+* Fixed exception in iOS from divide by zero due to no transcripts being available.
+
+Update 2020/03.23
+=================
+
+* Fixed issue with double results on some Android devices (LG G7 ThinQ for example; API 28)
diff --git a/README.md b/README.md
index 41b114b..3e46aa3 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,12 @@
 SpeechRecognitionPlugin
 =======================
 
-W3C Web Speech API - Speech Recognition plugin for PhoneGap
+W3C Web Speech API - Speech Recognition plugin for Cordova/PhoneGap
 
-Update 2013/09/05
-=================
+Basic Example
+=============
 
-Back to work on this but it's not ready yet so don't try to use.
-
-Update 2013/08/05
-=================
-
-Hi, you are all probably wondering where the code is after seeing my PhoneGap Day US presentation or reading the slides. Well, I've been dealing with an illness in the family and have not has as much spare time as I would have hoped to update this project. However, things are working out better than I could have hoped for and I should have time to concentrate on this very soon.
-
-Update 2015/04/04
-=================
-
-Basic example is working on iOS and android
+Basic example is working on iOS, Android, and some Browsers.
 ```
 <script type="text/javascript">
 var recognition;
@@ -41,50 +31,102 @@ function onDeviceReady() {
 Example from section 6.1 Speech Recognition Examples of the W3C page
 (https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html#examples)
 
-To install the plugin use 
+Installation
+============
+
+To install the plugin from Github, use
 
 ```
-cordova plugin add https://github.com/macdonst/SpeechRecognitionPlugin
+cordova plugin add https://github.com/wifisher/SpeechRecognitionPlugin --variable MICROPHONE_USAGE_DESCRIPTION="your usage message" --variable SPEECH_RECOGNITION_USAGE_DESCRIPTION="your usage message"
 ```
 
-Since iOS 10 it's mandatory to add a `NSMicrophoneUsageDescription` in the info.plist to access the microphone.
-
-
-To add this entry you can pass the `MICROPHONE_USAGE_DESCRIPTION` variable on plugin install.
-
+iOS Quirks
+==========
 
-Example:
+By default, this plugin sets up the app to only allow for audio input.
+As such, after the first recognition request, the app will no longer allow for audio output.
 
-`cordova plugin add https://github.com/macdonst/SpeechRecognitionPlugin --variable MICROPHONE_USAGE_DESCRIPTION="your usage message"`
+If you need to also support audio output, for example with the `phonegap-plugin-speech-synthesis` plugin,
+enable audio output with the `speechRecognitionAllowAudioOutput` preference in the `config.xml` file:
+```
+ <preference name="speechRecognitionAllowAudioOutput" value="true" />
+```
 
-If the variable is not provided it will use an empty message, but a usage description string is mandatory to submit your app to the Apple Store.
 
+iOS 10 and Newer
+----------------
 
 On iOS 10 and greater it uses the native SFSpeechRecognizer (same as Siri).
 
-Supported locales for SFSpeechRecognizer are:
-ro-RO, en-IN, he-IL, tr-TR, en-NZ, sv-SE, fr-BE, it-CH, de-CH, pl-PL, pt-PT, uk-UA, fi-FI, vi-VN, ar-SA, zh-TW, es-ES, en-GB, yue-CN, th-TH, en-ID, ja-JP, en-SA, en-AE, da-DK, fr-FR, sk-SK, de-AT, ms-MY, hu-HU, ca-ES, ko-KR, fr-CH, nb-NO, en-AU, el-GR, ru-RU, zh-CN, en-US, en-IE, nl-BE, es-CO, pt-BR, es-US, hr-HR, fr-CA, zh-HK, es-MX, id-ID, it-IT, nl-NL, cs-CZ, en-ZA, es-CL, en-PH, en-CA, en-SG, de-DE
+Since iOS 10 it's mandatory to add `NSMicrophoneUsageDescription` and `NSSpeechRecognitionUsageDescription` in the info.plist to access the microphone and speech recognition.
+To add this entry you can pass the `MICROPHONE_USAGE_DESCRIPTION` and `SPEECH_RECOGNITION_USAGE_DESCRIPTION` variables on plugin install.
 
-Two-character codes can be used too.
+If the variable is not provided it will use an empty message, but a usage description string is mandatory to submit your app to the Apple Store.
 
-On iOS 9 and older it uses iSpeech SDK, an API key is required, get one on https://www.ispeech.org/, it's free.
-To provide the key, add this preference inside the config.xml
-```
- <preference name="apiKey" value="yourApiKeyHere" />
- ```
- If none is provided it will use the demo key "developerdemokeydeveloperdemokey"
- 
-iSpeech supported languages are:
- 
-English (Canada) (en-CA) 	
-English (United States) (en-US) 	
-Spanish (Spain) (es-ES) 	
-French (France) (fr-FR) 	
-Italian (Italy) (it-IT) 	
-Polish (Poland) (pl-PL) 	
-Portuguese (Portugal) (pt-PT)
-
-
-Two-character codes can be used too, but for English, "en" will use "en-US" 
- 
- 
+Supported locales for SFSpeechRecognizer are:
+* ar-SA
+* ca-ES
+* cs-CZ
+* da-DK
+* de-AT
+* de-CH
+* de-DE
+* el-GR
+* en-AE
+* en-AU
+* en-CA
+* en-GB
+* en-ID
+* en-IE
+* en-IN
+* en-NZ
+* en-PH
+* en-SA
+* en-SG
+* en-US
+* en-ZA
+* es-CL
+* es-CO
+* es-ES
+* es-MX
+* es-US
+* fi-FI
+* fr-BE
+* fr-CA
+* fr-CH
+* fr-FR
+* he-IL
+* hr-HR
+* hu-HU
+* id-ID
+* it-CH
+* it-IT
+* ja-JP
+* ko-KR
+* ms-MY
+* nb-NO
+* nl-BE
+* nl-NL
+* pl-PL
+* pt-BR
+* pt-PT
+* ro-RO
+* ru-RU
+* sk-SK
+* sv-SE
+* th-TH
+* tr-TR
+* uk-UA
+* vi-VN
+* yue-CN
+* zh-CN
+* zh-HK
+* zh-TW
+* possibly others
+
+Two-character codes can be used as well.
+
+iOS 9 and Older
+---------------
+
+On iOS 9 and older are not supported.
diff --git a/SpeechRecognition.sln b/SpeechRecognition.sln
new file mode 100644
index 0000000..7149f9c
--- /dev/null
+++ b/SpeechRecognition.sln
@@ -0,0 +1,35 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Web
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "SpeechRecognition", ".", "{66E24856-A60A-4CEC-A98C-7FAE2D74279F}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		Debug.AspNetCompiler.VirtualPath = "/SpeechRecognition"
+		Debug.AspNetCompiler.PhysicalPath = "..\SpeechRecognition\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\SpeechRecognition\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/SpeechRecognition"
+		Release.AspNetCompiler.PhysicalPath = "..\SpeechRecognition\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\SpeechRecognition\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "50678"
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{66E24856-A60A-4CEC-A98C-7FAE2D74279F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66E24856-A60A-4CEC-A98C-7FAE2D74279F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/package.json b/package.json
index e627502..e6cbd64 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,19 @@
 {
   "name": "phonegap-plugin-speech-recognition",
-  "version": "0.3.0",
+  "version": "0.3.4",
   "description": "Cordova Speech Recognition Plugin",
   "cordova": {
     "id": "phonegap-plugin-speech-recognition",
-    "platforms": ["android", "ios"]
+    "platforms": [ "android", "browser", "ios" ]
+  },
+  "engines": {
+    "cordovaDependencies": {
+      "0.3.0": { "cordova-android": ">6.3.0" }
+    }
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/macdonst/SpeechRecognitionPlugin.git"
+    "url": "git+https://github.com/wifisher/SpeechRecognitionPlugin.git"
   },
   "keywords": [
     "cordova",
@@ -19,9 +24,10 @@
     "cordova-ios"
   ],
   "author": "Simon MacDonald",
+  "contributors": ["Wayne Fisher <wayne@fisherlea.com"],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/macdonst/SpeechRecognitionPlugin/issues"
+    "url": "https://github.com/wifisher/SpeechRecognitionPlugin/issues"
   },
-  "homepage": "https://github.com/macdonst/SpeechRecognitionPlugin#readme"
+  "homepage": "https://github.com/wifisher/SpeechRecognitionPlugin#readme"
 }
diff --git a/plugin.xml b/plugin.xml
index 7bde0b4..b89a32a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin
     xmlns="http://www.phonegap.com/ns/plugins/1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" id="phonegap-plugin-speech-recognition" version="0.3.0">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    id="phonegap-plugin-speech-recognition"
+    version="0.3.4">
     <name>SpeechRecognition</name>
     <description>Cordova Speech Recognition Plugin</description>
     <license>MIT</license>
     <keywords>cordova,speech,recognition</keywords>
-    <dependency id="cordova-plugin-compat" version="^1.0.0" />
-    <!-- android -->
+  <engines>
+    <engine name="cordova-android" version=">=6.3.0" />
+  </engines>
+  <!-- android -->
     <platform name="android">
         <js-module src="www/SpeechRecognition.js" name="SpeechRecognition">
             <clobbers target="SpeechRecognition" />
@@ -75,25 +79,13 @@
             </feature>
         </config-file>
         <source-file src="src/ios/SpeechRecognition.m" />
-        <source-file src="src/ios/libiSpeechSDK.a" framework="true" />
         <header-file src="src/ios/SpeechRecognition.h" />
-        <header-file src="src/ios/Headers/iSpeechSDK.h" />
-        <header-file src="src/ios/Headers/ISSpeechRecognition.h" />
-        <header-file src="src/ios/Headers/ISSpeechRecognitionLocales.h" />
-        <header-file src="src/ios/Headers/ISSpeechRecognitionResult.h" />
-        <header-file src="src/ios/Headers/ISSpeechSynthesis.h" />
-        <header-file src="src/ios/Headers/ISSpeechSynthesisVoices.h" />
-        <framework src="AudioToolbox.framework" />
-        <framework src="SystemConfiguration.framework" />
-        <framework src="Security.framework" />
-        <framework src="CFNetwork.framework" />
         <framework src="Speech.framework" weak="true" />
-        <resource-file src="src/ios/iSpeechSDK.bundle" />
-        <preference name="MICROPHONE_USAGE_DESCRIPTION" default=" " />
+        <preference name="MICROPHONE_USAGE_DESCRIPTION" default="Allow for voice recognition." />
         <config-file target="*-Info.plist" parent="NSMicrophoneUsageDescription">
             <string>$MICROPHONE_USAGE_DESCRIPTION</string>
         </config-file>
-        <preference name="SPEECH_RECOGNITION_USAGE_DESCRIPTION" default=" " />
+        <preference name="SPEECH_RECOGNITION_USAGE_DESCRIPTION" default="Allow you to provide voice commands to the app." />
         <config-file target="*-Info.plist" parent="NSSpeechRecognitionUsageDescription">
             <string>$SPEECH_RECOGNITION_USAGE_DESCRIPTION</string>
         </config-file>
diff --git a/src/android/SpeechRecognition.java b/src/android/SpeechRecognition.java
index 023a140..95f8157 100644
--- a/src/android/SpeechRecognition.java
+++ b/src/android/SpeechRecognition.java
@@ -32,13 +32,19 @@ public class SpeechRecognition extends CordovaPlugin {
     public static final String ACTION_SPEECH_RECOGNIZE_STOP = "stop";
     public static final String ACTION_SPEECH_RECOGNIZE_ABORT = "abort";
     public static final String NOT_PRESENT_MESSAGE = "Speech recognition is not present or enabled";
+    public static final String SERVICE_URI_LOCAL = "local";
 
     private CallbackContext speechRecognizerCallbackContext;
     private boolean recognizerPresent = false;
     private SpeechRecognizer recognizer;
     private boolean aborted = false;
+    private boolean started = false;
     private boolean listening = false;
+    private boolean speaking = false;
+    private boolean interimResults = false;
+    private int maxAlternatives = 1;
     private String lang;
+    private String serviceURI;
 
     private static String [] permissions = { Manifest.permission.RECORD_AUDIO };
     private static int RECORD_AUDIO = 0;
@@ -67,7 +73,7 @@ public void onRequestPermissionResult(int requestCode, String[] permissions,
         {
             if(r == PackageManager.PERMISSION_DENIED)
             {
-                fireErrorEvent();
+                fireErrorEvent(4, "Permission denied for microphone access.");
                 fireEvent("end");
                 return;
             }
@@ -77,6 +83,7 @@ public void onRequestPermissionResult(int requestCode, String[] permissions,
 
     @Override
     public boolean execute(String action, JSONArray args, CallbackContext callbackContext) {
+        Log.d(LOG_TAG, "action: " + action);
         // Dispatcher
         if (ACTION_INIT.equals(action)) {
             // init
@@ -103,6 +110,10 @@ else if (ACTION_SPEECH_RECOGNIZE_START.equals(action)) {
                 callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.ERROR, NOT_PRESENT_MESSAGE));
             }
             this.lang = args.optString(0, "en");
+            this.interimResults = args.optBoolean(1, false);
+            this.maxAlternatives = args.optInt(2, 1);
+            this.serviceURI = args.optString(3, "");
+
             this.speechRecognizerCallbackContext = callbackContext;
             this.promptForMic();
         }
@@ -124,10 +135,12 @@ private void startRecognition() {
 
         final Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
         intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,RecognizerIntent.LANGUAGE_MODEL_FREE_FORM);
-        intent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE,"voice.recognition.test");
         intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE,lang);
-
-        intent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS,5);
+        intent.putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS,interimResults);
+        intent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS,maxAlternatives);
+        if (SERVICE_URI_LOCAL.equals(serviceURI)) {
+            intent.putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, true);
+        }
 
         Handler loopHandler = new Handler(Looper.getMainLooper());
         loopHandler.post(new Runnable() {
@@ -146,15 +159,27 @@ public void run() {
     
     private void stop(boolean abort) {
         this.aborted = abort;
-        Handler loopHandler = new Handler(Looper.getMainLooper());
-        loopHandler.post(new Runnable() {
+        if (abort) {
+            Handler loopHandler = new Handler(Looper.getMainLooper());
+            loopHandler.post(new Runnable() {
 
-            @Override
-            public void run() {
-                recognizer.stopListening();
-            }
-            
-        });
+                @Override
+                public void run() {
+                    recognizer.cancel();
+                }
+
+            });
+        } else if (started) {
+            Handler loopHandler = new Handler(Looper.getMainLooper());
+            loopHandler.post(new Runnable() {
+
+                @Override
+                public void run() {
+                    recognizer.stopListening();
+                }
+
+            });
+        }
     }
 
     /**
@@ -165,22 +190,29 @@ private boolean DoInit() {
         return this.recognizerPresent;
     }
 
-    private void fireRecognitionEvent(ArrayList<String> transcripts, float[] confidences) {
+    private void fireRecognitionEvent(String type, ArrayList<String> transcripts, float[] confidences, boolean isFinal) {
+        Log.d(LOG_TAG, "fire recognition event: " + type);
+
         JSONObject event = new JSONObject();
         JSONArray results = new JSONArray();
+        JSONArray alternatives = new JSONArray();
         try {
             for(int i=0; i<transcripts.size(); i++) {
-                JSONArray alternatives = new JSONArray();
-                JSONObject result = new JSONObject();
-                result.put("transcript", transcripts.get(i));
-                result.put("final", true);
+                JSONObject alternative = new JSONObject();
+                alternative.put("transcript", transcripts.get(i));
+                // The spec has the final (isFinal) attribute as part of the result and not per alternative.
+                // For backwards compatibility, we leave it here and let the Javascript add it to the result list.
+                alternative.put("final", isFinal);
                 if (confidences != null) {
-                    result.put("confidence", confidences[i]);
+                    alternative.put("confidence", confidences[i]);
+                } else {
+                    alternative.put("confidence", 0);
                 }
-                alternatives.put(result);
-                results.put(alternatives);
+                alternatives.put(alternative);
             }
-            event.put("type", "result");
+            results.put(alternatives);
+            event.put("type", type);
+            event.put("resultIndex", 0);
             event.put("emma", null);
             event.put("interpretation", null);
             event.put("results", results);
@@ -193,6 +225,7 @@ private void fireRecognitionEvent(ArrayList<String> transcripts, float[] confide
     }
 
     private void fireEvent(String type) {
+        Log.d(LOG_TAG, "fire event: " + type);
         JSONObject event = new JSONObject();
         try {
             event.put("type",type);
@@ -204,10 +237,13 @@ private void fireEvent(String type) {
         this.speechRecognizerCallbackContext.sendPluginResult(pr); 
     }
 
-    private void fireErrorEvent() {
+    private void fireErrorEvent(int errorCode, String message) {
+        Log.d(LOG_TAG, "fire error event: " + errorCode + " - " + message);
         JSONObject event = new JSONObject();
         try {
             event.put("type","error");
+            event.put("error", errorCode);
+            event.put("message", message);
         } catch (JSONException e) {
             // this will never happen
         }
@@ -221,8 +257,7 @@ class SpeechRecognitionListner implements RecognitionListener {
         @Override
         public void onBeginningOfSpeech() {
             Log.d(LOG_TAG, "begin speech");
-            fireEvent("start");
-            fireEvent("audiostart");
+            speaking = true;
             fireEvent("soundstart");
             fireEvent("speechstart");
         }
@@ -235,20 +270,86 @@ public void onBufferReceived(byte[] buffer) {
         @Override
         public void onEndOfSpeech() {
             Log.d(LOG_TAG, "end speech");
-            fireEvent("speechend");
-            fireEvent("soundend");
-            fireEvent("audioend");
-            fireEvent("end");
+            if(speaking) {
+                fireEvent("speechend");
+                fireEvent("soundend");
+                speaking = false;
+            }
+            if(listening) {
+                fireEvent("audioend");
+                listening = false;
+            }
         }
 
         @Override
         public void onError(int error) {
-            Log.d(LOG_TAG, "error speech "+error);
-            if (listening || error == 9) {
-                fireErrorEvent();
+            Log.d(LOG_TAG, "error " + error);
+            switch(error) {
+                case SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS:
+                    Log.d(LOG_TAG, "ERROR_INSUFFICIENT_PERMISSIONS");
+                    fireErrorEvent(4, "Permission denied.");
+                    break;
+
+                case SpeechRecognizer.ERROR_SPEECH_TIMEOUT:
+                    Log.d(LOG_TAG, "ERROR_SPEECH_TIMEOUT");
+                    fireErrorEvent(0, "Timeout.");
+                    break;
+
+                case SpeechRecognizer.ERROR_NETWORK:
+                    Log.d(LOG_TAG, "ERROR_NETWORK");
+                    fireErrorEvent(3, "Network communication error.");
+                    break;
+
+                case SpeechRecognizer.ERROR_NETWORK_TIMEOUT:
+                    Log.d(LOG_TAG, "ERROR_NETWORK_TIMEOUT");
+                    fireErrorEvent(3, "Network timeout.");
+                    break;
+
+                case SpeechRecognizer.ERROR_AUDIO:
+                    Log.d(LOG_TAG, "ERROR_AUDIO");
+                    fireErrorEvent(2, "Audio recording error.");
+                    break;
+
+                case SpeechRecognizer.ERROR_CLIENT:
+                    Log.d(LOG_TAG, "ERROR_CLIENT");
+                    fireErrorEvent(4, "Client side error.");
+                    break;
+
+                case SpeechRecognizer.ERROR_RECOGNIZER_BUSY:
+                    Log.d(LOG_TAG, "ERROR_RECOGNIZER_BUSY");
+                    fireErrorEvent(4, "Busy.");
+                    break;
+
+                case SpeechRecognizer.ERROR_SERVER:
+                    Log.d(LOG_TAG, "ERROR_SERVER");
+                    fireErrorEvent(4, "Server error.");
+                    break;
+
+                case SpeechRecognizer.ERROR_NO_MATCH:
+                    Log.d(LOG_TAG, "ERROR_NO_MATCH");
+                    Log.d(LOG_TAG, "SpeechRecognizer.ERROR_NO_MATCH");
+                    ArrayList<String> transcript = new ArrayList<String>();
+                    float[] confidence = {};
+                    fireRecognitionEvent("nomatch", transcript, confidence, true);
+                    break;
+
+                default:
+                    fireErrorEvent(4, "Error " + error);
+                    break;
+            }
+            if(speaking) {
+                fireEvent("speechend");
+                fireEvent("soundend");
+                speaking = false;
+            }
+            if(listening) {
+                fireEvent("audioend");
+                listening = false;
+            }
+            if(started) {
                 fireEvent("end");
+                started = false;
             }
-            listening = false;
         }
 
         @Override
@@ -258,35 +359,44 @@ public void onEvent(int eventType, Bundle params) {
 
         @Override
         public void onPartialResults(Bundle partialResults) {
-            Log.d(LOG_TAG, "partial results");
+            Log.d(LOG_TAG, "onPartialResults " + partialResults);
+            ArrayList<String> transcript = partialResults.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION);
+            float[] confidence = partialResults.getFloatArray(SpeechRecognizer.CONFIDENCE_SCORES);
+            if (transcript.size() > 0) {
+                fireRecognitionEvent("result", transcript, confidence, false);
+            }
         }
 
         @Override
         public void onReadyForSpeech(Bundle params) {
             Log.d(LOG_TAG, "ready for speech");
+            started = true;
+            fireEvent("start");
             listening = true;
+            fireEvent("audiostart");
         }
 
         @Override
         public void onResults(Bundle results) {
-            Log.d(LOG_TAG, "results");
-            String str = new String();
             Log.d(LOG_TAG, "onResults " + results);
-            ArrayList<String> transcript = results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION);
-            float[] confidence = results.getFloatArray(SpeechRecognizer.CONFIDENCE_SCORES);
-            if (transcript.size() > 0) {
-                Log.d(LOG_TAG, "fire recognition event");
-                fireRecognitionEvent(transcript, confidence);
+            if(started) {
+                ArrayList<String> transcript = results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION);
+                float[] confidence = results.getFloatArray(SpeechRecognizer.CONFIDENCE_SCORES);
+                if (transcript.size() > 0) {
+                    fireRecognitionEvent("result", transcript, confidence, true);
+                } else {
+                    fireRecognitionEvent("nomatch", transcript, confidence, true);
+                }
+                started = false;
+                fireEvent("end");
             } else {
-                Log.d(LOG_TAG, "fire no match event");
-                fireEvent("nomatch");
+                Log.w(LOG_TAG, "ignore result when not started/or double result");
             }
-            listening = false;
         }
 
         @Override
         public void onRmsChanged(float rmsdB) {
-            Log.d(LOG_TAG, "rms changed");
+            //Log.d(LOG_TAG, "rms changed");
         }
         
     }
diff --git a/src/ios/Headers/ISSpeechRecognition.h b/src/ios/Headers/ISSpeechRecognition.h
deleted file mode 100644
index dc4cad0..0000000
--- a/src/ios/Headers/ISSpeechRecognition.h
+++ /dev/null
@@ -1,249 +0,0 @@
-//
-//  ISSpeechRecognition.h
-//  iSpeechSDK
-//
-//  Copyright (c) 2012 iSpeech, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <AudioToolbox/AudioToolbox.h>
-
-#import "iSpeechSDK.h"
-
-#import "ISSpeechRecognitionLocales.h"
-#import "ISSpeechRecognitionResult.h"
-
-/**
- * The type of model to use when trascribing audio. Currently, only SMS and Dictation are available.
- */
-enum {
-	ISFreeFormTypeSMS = 1,
-	ISFreeFormTypeVoicemail = 2,
-	ISFreeFormTypeDictation = 3,
-	ISFreeFormTypeMessage = 4,
-	ISFreeFormTypeInstantMessage = 5,
-	ISFreeFormTypeTranscript = 6,
-	ISFreeFormTypeMemo = 7,
-};
-
-typedef NSUInteger ISFreeFormType;
-
-#if NS_BLOCKS_AVAILABLE
-
-/*^*
- * The callback handler for speech recognition request.
- *
- * @param error An error, if one occured, or `nil`.
- * @param result The result of a successful recognition, or `nil` if there's an error.
- * @param cancelledByUser Whether speech recognition finished because a user cancelled the request.
- */
-typedef void(^ISSpeechRecognitionHandler)(NSError *error, ISSpeechRecognitionResult *result, BOOL cancelledByUser);
-
-#endif
-
-@class ISSpeechRecognition;
-
-/**
- * Delegate protocol for `ISSpeechRecognition`.
- * 
- * The only required method is for getting the result from speech recognition.
- */
-@protocol ISSpeechRecognitionDelegate <NSObject>
-
-@required
-
-/**
- * Speech recognition successfully completed, and a result was sent back from the server.
- * 
- * If you get no result text back, and a confience level of 0.0, then, most likely, the user didn't speak anything.
- * 
- * @param speechRecognition The speech recognition instance that completed.
- * @param result The result text and confidence level.
- */
-- (void)recognition:(ISSpeechRecognition *)speechRecognition didGetRecognitionResult:(ISSpeechRecognitionResult *)result;
-
-@optional
-
-/**
- * Something went wrong, speech recognition failed, and an error was passed back.
- * 
- * @param speechRecognition The speech recognition instance that was cancelled.
- * @param error The acutal error. Errors from the SDK internals will have the error domain of `iSpeechErrorDomain`. You may get some URL connection errors if something happens with the network.
- */
-- (void)recognition:(ISSpeechRecognition *)speechRecognition didFailWithError:(NSError *)error;
-
-/**
- * Speech recognition was cancelled by the user.
- * 
- * @param speechRecognition The speech recognition instance that was cancelled.
- */
-- (void)recognitionCancelledByUser:(ISSpeechRecognition *)speechRecognition;
-
-/**
- * Recording the user's speech has started.
- * 
- * @param speechRecognition The speech recognition instance that started recording audio.
- */
-- (void)recognitionDidBeginRecording:(ISSpeechRecognition *)speechRecognition;
-
-/**
- * Speech recognition has finished recording and is moving on to recognizing the text.
- * 
- * This happens when the timeout is hit for a timed listen, or when the user taps the "Done" button on the dialog.
- * 
- * @param speechRecognition The speech recognition instance that finished recording.
- */
-- (void)recognitionDidFinishRecording:(ISSpeechRecognition *)speechRecognition;
-
-@end
-
-/**
- * The interface for doing speech recognition in the SDK.
- */
-@interface ISSpeechRecognition : NSObject
-
-/** @name Getting and Setting the Delegate */
-
-/**
- * The delegate of a speech recognition object.
- * 
- * The delegate must adopt the `<ISSpeechRecognitionDelegate>` protocol.
- */
-@property (nonatomic, unsafe_unretained) id <ISSpeechRecognitionDelegate> delegate;
-
-/** @name Configuration Properties */
-
-/**
- * Sets the locale to use for speech recognition.
- *
- * Most of the time, the value passed is a ISO country code. To get our supported ISOs, consult "Freeform Dictation Languages" under "Speech Recognition Settings" when viewing details about a specific key.
- */
-@property (nonatomic, copy) NSString *locale CONFIGURATION_METHOD;
-
-/**
- * Allows you to set a custom language model for speech recognition.
- */
-@property (nonatomic, copy) NSString *model CONFIGURATION_METHOD;
-
-/**
- * The type of model to use when trascribing audio. Defaults to `ISFreeFormTypeDictation`. 
- */
-@property (nonatomic, assign) ISFreeFormType freeformType CONFIGURATION_METHOD;
-
-/**
- * Whether silence detection should be used to automatically detect when someone's done talking.
- */
-@property (nonatomic, assign) BOOL silenceDetectionEnabled CONFIGURATION_METHOD;
-
-/** @name Detecting Audio Input */
-
-/**
- * Returns whether audio input is available for speech recognition. You can check this before creating an instance of `ISSpeechRecognition`, as well as to dynamically update your UI with what you can do.
- * 
- * @return Returns whether audio input is available.
- */
-+ (BOOL)audioInputAvailable;
-
-/** @name Aliases and Commands */
-
-/**
- * Adds a list of items as an alias.
- * 
- * Think of using an alias list as a way of doing a regular expression. For example, if you want to use a regular expression to match "call joe", "call charlie", or "call ben", then it would be `call (joe|charlie|ben)`. Similarly, to do that with an alias list,
- *
- *	[speechRecognitionInstance addAlias:@"PEOPLE" forItems:[NSArray arrayWithObjects:@"joe", @"charlie", @"ben", nil]];
- *	[speechRecognitionInstance addCommand:@"call %PEOPLE%"];
- * 
- * @param alias The string to use for the alias key.
- * @param items The array of items to be substituted for the alias.
- */
-- (void)addAlias:(NSString *)alias forItems:(NSArray *)items;
-
-/**
- * Adds a command.
- *
- * If you want to reference an alias list, the format is `%ALIAS_LIST_NAME%`. Replace `ALIAS_LIST_NAME` with the actual name of your alias list.
- * 
- * @param command The command to be added.
- */
-- (void)addCommand:(NSString *)command;
-
-/**
- * Add multiple commands from an array.
- * 
- * @param commands The array of commands to be added.
- */
-- (void)addCommands:(NSArray *)commands;
-
-/**
- * Clears any command or alias lists on this speech recognition object.
- */
-- (void)resetCommandsAndAliases;
-
-/** @name Listening and Recognizing */
-
-/**
- * Start an untimed listen.
- * 
- * An untimed listen means that the SDK will start listening, and will not stop unless you tell it to by calling -[ISSpeechRecognition finishListenAndStartRecognize], or until silence detection kicks in, if you have that enabled.
- * 
- * If you're using a command or alias list, use `-listenAndRecognizeWithTimeout:error:` instead. This will ensure that speech recognition will only last as long as is necessary, thus saving the user's battery life and data plan, ensuring that you get a result back, and providing an better overall experience.
- * 
- * @param err An `NSError` pointer to get an error object out of the method if something goes wrong.
- * @return Returns whatever speech synthesis successfully started. If this returns `NO`, check the error for details on what went wrong.
- * @see listenAndRecognizeWithTimeout:error:
- * @see finishListenAndStartRecognize
- */
-- (BOOL)listen:(NSError **)err;
-
-/**
- * If you're running an untimed listen, or if you want to cut a timed listen short, call this method to tell the SDK to stop listening for audio, and finish up transcribing.
- */
-- (void)finishListenAndStartRecognize;
-
-/**
- * Starts a timed listen. After a set timeout, the SDK will stop listening for audio and will start to transcribe it.
- * 
- * Useful when using command lists to ensure that the user doesn't talk longer than necessary.
- * 
- * @param timeout The amount of time, in seconds, for the timed listen to last for.
- * @param err An `NSError` pointer to get an error object out of the method if something goes wrong.
- * @return Returns whatever speech synthesis successfully started. If this returns `NO`, check the error for details on what went wrong.
- */
-- (BOOL)listenAndRecognizeWithTimeout:(NSTimeInterval)timeout error:(NSError **)err;
-
-#if NS_BLOCKS_AVAILABLE
-
-/**
- * Start an untimed listen.
- *
- * An untimed listen means that the SDK will start listening, and will not stop unless you tell it to by calling -[ISSpeechRecognition finishListenAndStartRecognize], or until silence detection kicks in, if you have that enabled.
- *
- * If you're using a command or alias list, use `-listenAndRecognizeWithTimeout:handler:` instead. This will ensure that speech recognition will only last as long as is necessary, thus saving the user's battery life and data plan, ensuring that you get a result back, and providing an better overall experience.
- *
- * @param handler An `ISSpeechRecognitionHandler` block that will be executed on the main thread when speech recognition completes, or when an error occurs.
- * @see listenAndRecognizeWithTimeout:handler:
- * @see finishListenAndStartRecognize
- */
-- (void)listenWithHandler:(ISSpeechRecognitionHandler)handler;
-
-/**
- * Starts a timed listen. After a set timeout, the SDK will stop listening for audio and will start to transcribe it.
- *
- * Useful when using command lists to ensure that the user doesn't talk longer than necessary.
- *
- * @param timeout The amount of time, in seconds, for the timed listen to last for.
- * @param handler An `ISSpeechRecognitionHandler` block that will be executed on the main thread when speech recognition completes, or when an error occurs.
- */
-- (void)listenAndRecognizeWithTimeout:(NSTimeInterval)timeout handler:(ISSpeechRecognitionHandler)handler;
-
-#endif
-
-/**
- * Cancels an in progress speech recognition action.
- * 
- * If, for some reason, you need to cancel an in progress speech recognition action, call this method. It's also a good idea to provide feedback to the user as to why you cancelled it.
- */
-- (void)cancel;
-
-@end
\ No newline at end of file
diff --git a/src/ios/Headers/ISSpeechRecognitionLocales.h b/src/ios/Headers/ISSpeechRecognitionLocales.h
deleted file mode 100644
index a949866..0000000
--- a/src/ios/Headers/ISSpeechRecognitionLocales.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  ISSpeechRecognitionLocales.h
-//  iSpeechSDK
-//
-//  Copyright (c) 2012 iSpeech, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-extern NSString *const ISLocaleUSEnglish;
-extern NSString *const ISLocaleCAEnglish;
-extern NSString *const ISLocaleGBEnglish;
-extern NSString *const ISLocaleAUEnglish;
-extern NSString *const ISLocaleESSpanish;
-extern NSString *const ISLocaleMXSpanish;
-extern NSString *const ISLocaleITItalian;
-extern NSString *const ISLocaleFRFrench;
-extern NSString *const ISLocaleCAFrench;
-extern NSString *const ISLocalePLPolish;
-extern NSString *const ISLocaleBRPortuguese;
-extern NSString *const ISLocalePTPortuguese;
-extern NSString *const ISLocaleCACatalan;
-extern NSString *const ISLocaleCNChinese;
-extern NSString *const ISLocaleHKChinese;
-extern NSString *const ISLocaleTWChinese;
-extern NSString *const ISLocaleDKDanish;
-extern NSString *const ISLocaleDEGerman;
-extern NSString *const ISLocaleFIFinish;
-extern NSString *const ISLocaleJAJapanese;
-extern NSString *const ISLocaleKRKorean;
-extern NSString *const ISLocaleNLDutch;
-extern NSString *const ISLocaleNONorwegian;
-extern NSString *const ISLocaleRURussian;
-extern NSString *const ISLocaleSESwedish;
diff --git a/src/ios/Headers/ISSpeechRecognitionResult.h b/src/ios/Headers/ISSpeechRecognitionResult.h
deleted file mode 100644
index 489c6f7..0000000
--- a/src/ios/Headers/ISSpeechRecognitionResult.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  ISSpeechRecognitionResult.h
-//  iSpeechSDK
-//
-//  Copyright (c) 2012 iSpeech, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-/**
- * This class contains information about a successful recognition.
- */
-@interface ISSpeechRecognitionResult : NSObject
-
-/**
- * The transcribed text returned from a recognition.
- */
-@property (nonatomic, copy, readonly) NSString *text;
-
-/**
- * How confident the speech recognizer was. Scale from 0.0 to 1.0.
- */
-@property (nonatomic, assign, readonly) float confidence;
-
-@end
diff --git a/src/ios/Headers/ISSpeechSynthesis.h b/src/ios/Headers/ISSpeechSynthesis.h
deleted file mode 100644
index 895d7d0..0000000
--- a/src/ios/Headers/ISSpeechSynthesis.h
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-//  ISSpeechSynthesis.h
-//  iSpeechSDK
-//
-//  Copyright (c) 2012 iSpeech, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-#import "iSpeechSDK.h"
-#import "ISSpeechSynthesisVoices.h"
-
-#if NS_BLOCKS_AVAILABLE
-
-/*^*
- * The callback handler for a speech synthesis request.
- *
- * @param error An error for the request, if one occurred, otherwise, `nil`.
- * @param userCancelled Whether speech synthesis finished as a result of user cancellation or not.
- */
-typedef void(^ISSpeechSynthesisHandler)(NSError *error, BOOL userCancelled);
-
-#endif
-
-@class ISSpeechSynthesis;
-
-/**
- * Delegate protocol for `ISSpeechSynthesis`.
- * 
- * All methods are optional.
- */
-@protocol ISSpeechSynthesisDelegate <NSObject>
-
-@optional
-
-/**
- * The specified speech synthesis instance started speaking. Audio is now playing.
- * 
- * @param speechSynthesis The speech synthesis object that is speaking.
- */
-- (void)synthesisDidStartSpeaking:(ISSpeechSynthesis *)speechSynthesis;
-
-/**
- * The specified speech synthesis isntance finished speaking, either on its own or because the user cancelled it.
- * 
- * @param speechSynthesis The speech synthesis object that finished speaking.
- * @param userCancelled Whether the user was responsible for cancelling the speech synthesis, usually by tapping the "Cancel" button on the dialog.
- */
-- (void)synthesisDidFinishSpeaking:(ISSpeechSynthesis *)speechSynthesis userCancelled:(BOOL)userCancelled;
-
-/**
- * Something went wrong with the speech synthesis. Usually this is used for errors returned by the server.
- * 
- * @param speechSynthesis The speech synthesis object that the error occurred on.
- * @param error The acutal error. Errors from the SDK internals will have the error domain of `iSpeechErrorDomain`. You may get some URL connection errors if something happens with the network.
- */
-- (void)synthesis:(ISSpeechSynthesis *)speechSynthesis didFailWithError:(NSError *)error;
-
-@end
-
-/**
- * The interface for doing speech synthesis in the SDK.
- */
-@interface ISSpeechSynthesis : NSObject
-
-/** @name Getting and Setting the Delegate */
-
-/**
- * The delegate of a speech synthesis object.
- * 
- * The delegate must adopt the `<ISSpeechSynthesisDelegate>` protocol.
- */
-@property (nonatomic, unsafe_unretained) id <ISSpeechSynthesisDelegate> delegate;
-
-/** @name Configuration Properties */
-
-/**
- * Sets the voice to use for this speech synthesis instance.
- * 
- * Voices are listed in the `ISSpeechSynthesisVoices.h` header file. You are not limited to that list; they are only standard voices. If you specify an invalid voice, the delegate will get an error.
- */
-@property (nonatomic, copy) NSString *voice CONFIGURATION_METHOD;
-
-/**
- * Sets the speed to use for speech synthesis.
- * 
- * This should be a number anywhere between -10 and 10, with -10 being the slowest, and 10 being the fastest. If you provide a number larger than 10, the speed will be set to 10. Likewise, if you provide a number smaller than -10, the speed will be set to -10.
- */
-@property (nonatomic, assign) NSInteger speed CONFIGURATION_METHOD;
-
-/**
- * The bitrate of the synthesised speech.
- * 
- * The higher the bitrate, the better quality the audio, but the larger the file size of the data being sent, which results in more buffering needed to load all that data. Default value is 48, which is sutable for WiFi, 4G, and 3G. 
- * 
- * Valid values include 8, 16, 24, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 192, 224, 256, and 320, as well as any others listed under "Bit Rates" for an API key's Text-to-Speech Settings.
- */
-@property (nonatomic, assign) NSInteger bitrate CONFIGURATION_METHOD;
-
-/** Getting and Setting the Text */
-
-/**
- * The text to speak.
- */
-@property (nonatomic, copy) NSString *text;
-
-/** @name Creating an Instance */
-
-/**
- * Create a new `ISSpeechSynthesis` object with the supplied text.
- *
- * @param text The initial text for the speech synthesis object.
- */
-- (id)initWithText:(NSString *)text;
-
-/** @name Speaking Text */
-
-/**
- * Speak the text that was specified when creating this instance.
- * 
- * @param err An `NSError` pointer to get an error object out of the method if something goes wrong.
- * @return Whether synthesis successfully started. If this returns `NO`, check the error for details on what went wrong.
- */
-- (BOOL)speak:(NSError **)err;
-
-#if NS_BLOCKS_AVAILABLE
-
-/**
- * Speak the text that was specified when creating this instance.
- *
- * @param handler A `ISSpeechSynthesisHandler` block to be executed when speaking finishes, or when an error occurs. This handler will be called on the main thread.
- */
-- (void)speakWithHandler:(ISSpeechSynthesisHandler)handler;
-
-#endif
-
-/**
- * Cancels an in-progress speech synthesis action.
- */
-- (void)cancel;
-
-@end
diff --git a/src/ios/Headers/ISSpeechSynthesisVoices.h b/src/ios/Headers/ISSpeechSynthesisVoices.h
deleted file mode 100644
index 58e1d08..0000000
--- a/src/ios/Headers/ISSpeechSynthesisVoices.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//  ISSpeechSynthesisVoices.h
-//  iSpeechSDK
-//
-//  Copyright (c) 2012 iSpeech, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-extern NSString *const ISVoiceUSEnglishFemale;
-extern NSString *const ISVoiceUSEnglishMale;
-extern NSString *const ISVoiceUKEnglishFemale;
-extern NSString *const ISVoiceUKEnglishMale;
-extern NSString *const ISVoiceAUEnglishFemale;
-extern NSString *const ISVoiceUSSpanishFemale;
-extern NSString *const ISVoiceUSSpanishMale;
-extern NSString *const ISVoiceCHChineseFemale;
-extern NSString *const ISVoiceCHChineseMale;
-extern NSString *const ISVoiceHKChineseFemale;
-extern NSString *const ISVoiceTWChineseFemale;
-extern NSString *const ISVoiceJPJapaneseFemale;
-extern NSString *const ISVoiceJPJapaneseMale;
-extern NSString *const ISVoiceKRKoreanFemale;
-extern NSString *const ISVoiceKRKoreanMale;
-extern NSString *const ISVoiceCAEnglishFemale;
-extern NSString *const ISVoiceHUHungarianFemale;
-extern NSString *const ISVoiceBRPortugueseFemale;
-extern NSString *const ISVoiceEURPortugueseFemale;
-extern NSString *const ISVoiceEURPortugueseMale;
-extern NSString *const ISVoiceEURSpanishFemale;
-extern NSString *const ISVoiceEURSpanishMale;
-extern NSString *const ISVoiceEURCatalanFemale;
-extern NSString *const ISVoiceEURCzechFemale;
-extern NSString *const ISVoiceEURDanishFemale;
-extern NSString *const ISVoiceEURFinnishFemale;
-extern NSString *const ISVoiceEURFrenchFemale;
-extern NSString *const ISVoiceEURFrenchMale;
-extern NSString *const ISVoiceEURNorwegianFemale;
-extern NSString *const ISVoiceEURDutchFemale;
-extern NSString *const ISVoiceEURDutchMale;
-extern NSString *const ISVoiceEURPolishFemale;
-extern NSString *const ISVoiceEURItalianFemale;
-extern NSString *const ISVoiceEURItalianMale;
-extern NSString *const ISVoiceEURTurkishFemale;
-extern NSString *const ISVoiceEURTurkishMale;
-extern NSString *const ISVoiceEURGermanFemale;
-extern NSString *const ISVoiceEURGermanMale;
-extern NSString *const ISVoiceRURussianFemale;
-extern NSString *const ISVoiceRURussianMale;
-extern NSString *const ISVoiceSWSwedishFemale;
-extern NSString *const ISVoiceCAFrenchFemale;
-extern NSString *const ISVoiceCAFrenchMale;
-extern NSString *const ISVoiceArabicMale;
diff --git a/src/ios/Headers/iSpeechSDK.h b/src/ios/Headers/iSpeechSDK.h
deleted file mode 100644
index 8c92a59..0000000
--- a/src/ios/Headers/iSpeechSDK.h
+++ /dev/null
@@ -1,222 +0,0 @@
-//
-//  iSpeechSDK.h
-//  iSpeechSDK
-//
-//  Copyright (c) 2012 iSpeech, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-// Methods marked with `CONFIGURATION_METHOD` can be set globally, for all objects, by calling the methods on [[iSpeechSDK sharedSDK] configuration]. This mimics the Appearance API in iOS 5.
-#define CONFIGURATION_METHOD 
-
-#import "ISSpeechSynthesis.h"
-#import "ISSpeechRecognition.h"
-
-// Protocol used by objects that act as the proxy for the Configuration API. For details on each property here, look at ISSpeechSynthesis and ISSpeechRecognition.
-@protocol ISConfiguration <NSObject>
-
-@property (nonatomic, copy) NSString *voice;
-@property (nonatomic, assign) NSInteger speed;
-@property (nonatomic, assign) NSInteger bitrate;
-
-@property (nonatomic, copy) NSString *locale;
-@property (nonatomic, copy) NSString *model;
-
-@property (nonatomic, assign) NSUInteger freeformType;
-
-@property (nonatomic, assign) BOOL silenceDetectionEnabled;
-@property (nonatomic, assign) BOOL adaptiveBitrateEnabled;
-
-@end
-
-/**
- * The error domain for errors returned by the SDK.
- */
-extern NSString *const iSpeechErrorDomain;
-
-/**
- * Possible error codes returned by the SDK.
- * 
- * Some of these should not be returned by the SDK (ones like `kISpeechErrorCodeInvalidFileFormat` and `kISpeechErrorCodeInvalidContentType`) because you don't have control over them. However, they are included in the off chance that something does go wrong with the server and they are returned. Codes that shouldn't be returned are marked with an asterisk (`*`).
- *
- * When you get an error during speech recognition, tell the user that something went wrong. If you get `kISpeechErrorCodeNoInputAvailable`, `kISpeechErrorCodeNoInternetConnection`, or `kISpeechErrorCodeLostInput` the error messages on those NSError instances have been localized, and are presentable to the user. 
- */
-enum _ISpeechErrorCode {
-	kISpeechErrorCodeInvalidAPIKey = 1,					// You provided an invalid API key.
-	kISpeechErrorCodeUnableToConvert = 2,				// The server was unable to convert your text to speech.
-	kISpeechErrorCodeNotEnoughCredits = 3,				// Your API key doesn't have the necessary credits required to complete this transaction.
-	kISpeechErrorCodeNoActionSpecified = 4,				// *
-	kISpeechErrorCodeInvalidText = 5,					// Usually, this error occurs when no text is sent to the server, or, for example, Japanese characters are sent to the English voice.
-	kISpeechErrorCodeTooManyWords = 6,					// You tried to convert too many words to speech.
-	kISpeechErrorCodeInvalidTextEntry = 7,				// *
-	kISpeechErrorCodeInvalidVoice = 8,					// You specified a voice that either doesn't exist, or that you don't have access to.
-	kISpeechErrorCodeInvalidFileFormat = 12,			// *
-	kISpeechErrorCodeInvalidSpeed = 13,					// *
-	kISpeechErrorCodeInvalidDictionary = 14,			// *
-	kISpeechErrorCodeInvalidBitrate = 15,				// You specified a bitrate that isn't one of the allowed values. See -[ISSpeechSynthesis bitrate] for details on valid values.
-	kISpeechErrorCodeInvalidFrequency = 16,				// *
-	kISpeechErrorCodeInvalidAliasList = 17,				// *
-	kISpeechErrorCodeAliasMissing = 18,					// *
-	kISpeechErrorCodeInvalidContentType = 19,			// *
-	kISpeechErrorCodeAliasListTooComplex = 20,			// *
-	kISpeechErrorCodeCouldNotRecognize = 21,			// If the audio isn't clear enough, or corrupted, this error will get returned. It's usually good UX to prompt the user to try again.
-	kISpeechErrorCodeOptionNotEnabled = 30,				// Option not enabled for your account. Please contact iSpeech sales at +1 (917) 338-7723 or at sales@ispeech.org to modify your license.
-	kISpeechErrorCodeNoAPIAccess = 997,					// *
-	kISpeechErrorCodeUnsupportedOutputType = 998,		// *
-	kISpeechErrorCodeInvalidRequest = 999,				// *
-	kISpeechErrorCodeTrialPeriodExceeded = 100,			// This evaluation account has exceeded its trial period. Please contact iSpeech sales at +1 (917) 338-7723 or at sales@ispeech.org to upgrade your license.
-	kISpeechErrorCodeAPIKeyDisabled = 101,				// Your key has been disabled. Please contact iSpeech sales at +1 (917) 338-7723 or at sales@ispeech.org to modify your license.
-	kISpeechErrorCodeInvalidRequestMethod = 1000,		// *
-	
-	// Error code 300 was "UserCancelled", but that has been wrapped into the SDK and is no longer used.
-	kISpeechErrorCodeNoInputAvailable = 301,			// You wanted to do speech recognition, but there's no mic available.
-	kISpeechErrorCodeNoInternetConnection = 302,		// There's no connection to the cloud to do speech synthesis or speech recognition.
-	kISpeechErrorCodeSDKIsBusy = 303,					// The SDK is busy doing either recognition or synthesis.
-	kISpeechErrorCodeSDKInterrupted = 304,				// The SDK was in the middle of doing something, and then got an audio session interruption
-	kISpeechErrorCodeCouldNotActiveAudioSession = 305,	// Unable to activate the audio session. Can happen when another audio session has higher precedence than ours does.
-	kISpeechErrorCodeCouldNotStartAudioQueue = 306,		// Unable to start an audio queue. Can happen when another audio queue has higher precedence than ours does.
-	kISpeechErrorCodeServerDied = 307,					// Server Died error. mediaserverd has died, and we need to clear out all our audio objects and start fresh.
-	kISpeechErrorCodeLostInput = 308,					// There was audio input, and speech recognition was happening, and then the audio input went away for some reason.
-	kISpeechErrorCodeBadHost = 309,						// The SSL Certificate chain was invalid, probably a result of some redirect away from iSpeech's servers. An example of this happening is when connected to a WiFi network that requires authentication before sending network requests.
-	
-	kISpeechErrorCodeUnknownError = 399
-};
-
-typedef NSUInteger iSpeechErrorCode;
-
-@class iSpeechSDK;
-
-/**
- * iSpeechSDKDelegate has optional methods to be notified when things happen on the SDK. Currently only notifies when an audio session interruption begins and ends.
- */
-@protocol iSpeechSDKDelegate <NSObject>
-
-@optional
-
-/**
- * The audio session has been interrupted. See [Responding to Audio Session Interruptions](https://developer.apple.com/library/ios/#documentation/Audio/Conceptual/AudioSessionProgrammingGuide/Cookbook/Cookbook.html#//apple_ref/doc/uid/TP40007875-CH6-SW7) in the [Audio Session Programming Guide](https://developer.apple.com/library/ios/#documentation/Audio/Conceptual/AudioSessionProgrammingGuide/Introduction/Introduction.html).
- * 
- * @param sdk The shared instance of the SDK.
- */
-- (void)iSpeechSDKDidBeginInterruption:(iSpeechSDK *)sdk;
-
-/**
- * The interupption on the audio session has ended. See [Responding to Audio Session Interruptions](https://developer.apple.com/library/ios/#documentation/Audio/Conceptual/AudioSessionProgrammingGuide/Cookbook/Cookbook.html#//apple_ref/doc/uid/TP40007875-CH6-SW7) in the [Audio Session Programming Guide](https://developer.apple.com/library/ios/#documentation/Audio/Conceptual/AudioSessionProgrammingGuide/Introduction/Introduction.html).
- * 
- * @param sdk The shared instance of the SDK.
- */
-- (void)iSpeechSDKDidEndInterruption:(iSpeechSDK *)sdk;
-
-@end
-
-/**
- * The shared SDK class. Configuration of the SDK happens on this object, as well as getting the configuration object to set global configuration for ISSpeechSynthesis and ISSpeechRecognition objects.
- */
-@interface iSpeechSDK : NSObject
-
-/** @name Configuring the SDK Instance */
-
-/**
- * Whether the SDK should use the Mobile Development Server (`YES`) or the Mobile Production Server (`NO`). This is set to `NO` by default.
- */
-@property (nonatomic, assign) BOOL usesDevServer;
-
-/**
- * Whether the SDK should vibrate on the Start Recording and Stop Recording prompts.
- *
- * These are off by default (`NO`) and will need to be turned on by setting this to `YES`.
- */
-@property (nonatomic, assign) BOOL vibrateOnPrompts;
-
-/**
- * Whether the SDK should play Success and Fail prompts on a successful or unsuccesful recognition.
- *
- * These are off by default (`NO`) and will need to be turned on by setting this to `YES`.
- */
-@property (nonatomic, assign) BOOL playsSuccessAndFailPrompts;
-
-/**
- * Allows you to tell the SDK whether or not it should deactivate the audio session once it's finished its stuff. If you're doing your own audio stuff in the app (such as playing music, an audiobook, etc.), you'd use this to make sure that your audio doesn't go away once the SDK finishes its speech synthesis or speech recognition. 
- */
-@property (nonatomic, assign) BOOL shouldDeactivateAudioSessionWhenFinished;
-
-/**
- * Any extra server params you want to send to the server.
- *
- * Use only if directed.
- */
-@property (nonatomic, copy) NSString *extraServerParams;
-
-/**
- * Sets the APIKey to send to the server.
- * 
- * The best place to set this is once in your `-applicationDidFinishLaunching:` method on your app delegate. Once set, you shoudn't have a reason to change it.
- */
-@property (nonatomic, copy) NSString *APIKey;
-
-/** @name Setting and Getting the Delegate */
-
-/**
- * Set the delegate to be notified of audio session interruptions.
- * 
- * The delegate must adopt the `<iSpeechSDKDelegate>` protocol.
- */
-@property (nonatomic, unsafe_unretained) id <iSpeechSDKDelegate> delegate;
-
-/** @name SDK Properties */
-
-/**
- * Returns whether the SDK is currently busy doing something, such as performing speech recognition or speech synthesis.
- */
-@property (nonatomic, assign, readonly) BOOL isBusy;
-
-/**
- * Returns the version number of the SDK. Useful for debugging purposes and bug reports.
- */
-@property (nonatomic, copy, readonly) NSString *version;
-
-/** @name Getting the SDK Instance */
-
-/**
- * The single instance of the iSpeechSDK class.
- * 
- * @return Returns the shared instance of the SDK.
- */
-+ (iSpeechSDK *)sharedSDK;
-
-/** @name Getting the Configuration Instance */
-
-/**
- * Method to get the configuration object to set properties globally for all objects. For example, if you wanted to set the voice for all speech recognition requests, you'd call `[[[iSpeechSDK sharedSDK] configuration] setVoice:VOICE_HERE]` and all subsequent speech recognition requests would use that voice.
- *
- * @return Returns the configuration proxy.
- */
-- (id <ISConfiguration>)configuration;
-
-/** @name Resetting the SDK */
-
-/**
- * If you get a lot of 303 errors, even though you know for a fact that the SDK isn't doing anything, call this method to reset the SDK's internals.
- * 
- * Configuration properties set, including your API key, and anything sent to `[[iSpeechSDK sharedSDK] configuration]` will not be affected by this call. The delegate for any active speech synthesis or speech recognition will get a `kISpeechErrorCodeServerDied` error code.
- *
- * @warning This is a temporary fix and will be removed for the final 1.0 relase of the SDK.
- */
-- (void)resetSDK;
-
-// The following methods are provided in the event that you initialize the audio session before the SDK has a chance to. If you do, you MUST call these methods in your interruption listener, otherwise the SDK WILL break.
-
-/** @name Interruption Handling */
-
-/**
- * Tells the SDK that an interruption has begun. If you initialize the audio session before the SDK, you must call this method to ensure that the SDK does not break.
- */
-- (void)beginInterruption;
-
-/**
- * Tells the SDK that an interruption has ended. If you initialize the audio session before the SDK, you must call this method to ensure that the SDK does not break.
- */
-- (void)endInterruption;
-
-@end
diff --git a/src/ios/SpeechRecognition.h b/src/ios/SpeechRecognition.h
index 31ce454..eb74a20 100644
--- a/src/ios/SpeechRecognition.h
+++ b/src/ios/SpeechRecognition.h
@@ -1,17 +1,20 @@
 #import <Cordova/CDV.h>
-#import "ISpeechSDK.h"
 #import <Speech/Speech.h>
 
-@interface SpeechRecognition : CDVPlugin <ISSpeechRecognitionDelegate>
+@interface SpeechRecognition : CDVPlugin
 
 @property (nonatomic, strong) CDVInvokedUrlCommand * command;
 @property (nonatomic, strong) CDVPluginResult* pluginResult;
-@property (nonatomic, strong) ISSpeechRecognition* iSpeechRecognition;
 @property (nonatomic, strong) SFSpeechRecognizer *sfSpeechRecognizer;
 @property (nonatomic, strong) AVAudioEngine *audioEngine;
+@property (nonatomic, strong) AVAudioSession *audioSession;
 @property (nonatomic, strong) SFSpeechAudioBufferRecognitionRequest *recognitionRequest;
 @property (nonatomic, strong) SFSpeechRecognitionTask *recognitionTask;
 
+@property (assign) NSString *sessionCategory;
+@property (assign) BOOL speechStartSent;
+@property (assign) BOOL resetAudioEngine;
+
 - (void) init:(CDVInvokedUrlCommand*)command;
 - (void) start:(CDVInvokedUrlCommand*)command;
 - (void) stop:(CDVInvokedUrlCommand*)command;
diff --git a/src/ios/SpeechRecognition.m b/src/ios/SpeechRecognition.m
index bf5a8c6..4810868 100644
--- a/src/ios/SpeechRecognition.m
+++ b/src/ios/SpeechRecognition.m
@@ -1,75 +1,171 @@
 //
 //  Created by jcesarmobile on 30/11/14.
-//
+//  Updates and enhancements by Wayne Fisher (Fisherlea Systems) 2018-2019.
 //
 
 #import "SpeechRecognition.h"
-#import "ISpeechSDK.h"
 #import <Speech/Speech.h>
 
+#if 0
+#define DBG(a)          NSLog(a)
+#define DBG1(a, b)      NSLog(a, b)
+#define DBG2(a, b, c)   NSLog(a, b, c)
+#else
+#define DBG(a)
+#define DBG1(a, b)
+#define DBG2(a, b, c)
+#endif
+
 @implementation SpeechRecognition
 
-- (void) init:(CDVInvokedUrlCommand*)command
-{
-    NSString * key = [self.commandDelegate.settings objectForKey:[@"apiKey" lowercaseString]];
-    if (!key) {
-        key = @"developerdemokeydeveloperdemokey";
+- (void) pluginInitialize {
+    NSError *error;
+
+    // We need to be notified of route changes to know when a
+    // Bluetooth headset becomes active. The audioEngine needs to be
+    // re-initialized in this case.
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(routeChanged:) name:AVAudioSessionRouteChangeNotification object:nil];
+
+    DBG(@"[sr] pluginInitialize()");
+
+    NSString * output = [self.commandDelegate.settings objectForKey:[@"speechRecognitionAllowAudioOutput" lowercaseString]];
+    if(output && [output caseInsensitiveCompare:@"true"] == NSOrderedSame) {
+        // If the allow audio output preference is set, the need to change the session category.
+        // This allows for speech recognition and speech synthesis to be used in the same app.
+        self.sessionCategory = AVAudioSessionCategoryPlayAndRecord;
+    } else {
+        // Maintain the original functionality for backwards compatibility.
+        self.sessionCategory = AVAudioSessionCategoryRecord;
     }
-    iSpeechSDK *sdk = [iSpeechSDK sharedSDK];
-    sdk.APIKey = key;
-    self.iSpeechRecognition = [[ISSpeechRecognition alloc] init];
+
+    self.resetAudioEngine = NO;
     self.audioEngine = [[AVAudioEngine alloc] init];
+    self.audioSession = [AVAudioSession sharedInstance];
+
+    if(![self.audioSession setCategory:self.sessionCategory
+                                  mode:AVAudioSessionModeMeasurement
+                               options:(AVAudioSessionCategoryOptionAllowBluetooth|AVAudioSessionCategoryOptionAllowBluetoothA2DP)
+                                 error:&error]) {
+        NSLog(@"[sr] Unable to setCategory: %@", error);
+    }
+}
+
+- (void)routeChanged:(NSNotification *)notification {
+    BOOL resetAudioEngine = NO;
+
+    NSNumber *reason = [notification.userInfo objectForKey:AVAudioSessionRouteChangeReasonKey];
+
+    DBG(@"[sr] routeChanged()");
+
+    AVAudioSessionRouteDescription *route;
+    AVAudioSessionPortDescription *port;
+
+    if ([reason unsignedIntegerValue] == AVAudioSessionRouteChangeReasonNewDeviceAvailable) {
+        NSLog(@"[sr] AVAudioSessionRouteChangeReasonNewDeviceAvailable");
+        resetAudioEngine = YES;
+
+        route = self.audioSession.currentRoute;
+        port = route.inputs[0];
+        NSLog(@"[sr] New device is %@", port.portType);
+    } else if ([reason unsignedIntegerValue] == AVAudioSessionRouteChangeReasonOldDeviceUnavailable) {
+        NSLog(@"[sr] AVAudioSessionRouteChangeReasonOldDeviceUnavailable");
+        resetAudioEngine = YES;
+
+        route = [notification.userInfo objectForKey:AVAudioSessionRouteChangePreviousRouteKey];
+        port = route.inputs[0];
+        NSLog(@"[sr] Removed device %@", port.portType);
+
+        route = self.audioSession.currentRoute;
+        port = route.inputs[0];
+        NSLog(@"[sr] Now using device %@", port.portType);
+    } else if ([reason unsignedIntegerValue] == AVAudioSessionRouteChangeReasonCategoryChange) {
+        NSLog(@"[sr] AVAudioSessionRouteChangeReasonCategoryChange");
+        
+        AVAudioSessionCategory category = [self.audioSession category];
+        
+        NSLog(@"[sr] AVAudioSession category: %@", category);
+        
+        if(![category isEqualToString:AVAudioSessionCategoryRecord] &&
+           ![category isEqualToString:AVAudioSessionCategoryPlayAndRecord]) {
+            if([category isEqualToString:AVAudioSessionCategoryPlayback]) {
+                category = AVAudioSessionCategoryPlayAndRecord;
+            } else {
+                category = self.sessionCategory;
+            }
+            
+            [self.audioSession setCategory:category error:nil];
+        }
+    }
+
+    if(resetAudioEngine) {
+        // If a Bluetooth device has been added or removed, we need to
+        // re-initialize the audioEngine to adapt to the different
+        // sampling rate of the Bluetooth headset (8kHz) vs the mic (44.1kHz).
+
+        NSLog(@"[sr] Need to reset audioEngine");
+        self.resetAudioEngine = YES;
+
+        // If we are currently running, we need to stop and release the
+        // existing recognition tasks. Otherwise, nothing gets received.
+        [self stopAndRelease];
+    }
+}
+
+- (void) init:(CDVInvokedUrlCommand*)command
+{
+    // This may be called multiple times by different instances of the Javascript SpeechRecognition object.
+    NSLog(@"[sr] init()");
+
+    self.pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:self.pluginResult callbackId:command.callbackId];
 }
 
 - (void) start:(CDVInvokedUrlCommand*)command
 {
+    DBG(@"[sr] start()");
+    if (!NSClassFromString(@"SFSpeechRecognizer")) {
+        [self sendErrorWithMessage:@"No speech recognizer service available." andCode:4];
+        return;
+    }
+
     self.command = command;
-    NSMutableDictionary * event = [[NSMutableDictionary alloc]init];
-    [event setValue:@"start" forKey:@"type"];
-    self.pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:event];
-    [self.pluginResult setKeepCallbackAsBool:YES];
-    [self.commandDelegate sendPluginResult:self.pluginResult callbackId:self.command.callbackId];
-    [self recognize];
+    [self sendEvent:(NSString *)@"start"];
+    
+    if(self.resetAudioEngine) {
+        NSLog(@"[sr] Reseting audioEngine");
+        self.audioEngine = [self.audioEngine init];
+        self.resetAudioEngine = NO;
+    }
 
+    [self recognize];
 }
 
 - (void) recognize
 {
+    DBG(@"[sr] recognize()");
     NSString * lang = [self.command argumentAtIndex:0];
     if (lang && [lang isEqualToString:@"en"]) {
         lang = @"en-US";
     }
 
-    if (NSClassFromString(@"SFSpeechRecognizer")) {
-
-        if (![self permissionIsSet]) {
-            [SFSpeechRecognizer requestAuthorization:^(SFSpeechRecognizerAuthorizationStatus status){
-                dispatch_async(dispatch_get_main_queue(), ^{
-
-                    if (status == SFSpeechRecognizerAuthorizationStatusAuthorized) {
-                        [self recordAndRecognizeWithLang:lang];
-                    } else {
-                        [self sendErrorWithMessage:@"Permission not allowed" andCode:4];
-                    }
-
-                });
-            }];
-        } else {
-            [self recordAndRecognizeWithLang:lang];
-        }
+    if (![self permissionIsSet]) {
+        [SFSpeechRecognizer requestAuthorization:^(SFSpeechRecognizerAuthorizationStatus status){
+            dispatch_async(dispatch_get_main_queue(), ^{
+                if (status == SFSpeechRecognizerAuthorizationStatusAuthorized) {
+                    [self recordAndRecognizeWithLang:lang];
+                } else {
+                    [self sendErrorWithMessage:@"Permission not allowed" andCode:4];
+                }
+            });
+        }];
     } else {
-        [self.iSpeechRecognition setDelegate:self];
-        [self.iSpeechRecognition setLocale:lang];
-        [self.iSpeechRecognition setFreeformType:ISFreeFormTypeDictation];
-        NSError *error;
-        if(![self.iSpeechRecognition listenAndRecognizeWithTimeout:10 error:&error]) {
-            NSLog(@"ERROR: %@", error);
-        }
+        [self recordAndRecognizeWithLang:lang];
     }
 }
 
 - (void) recordAndRecognizeWithLang:(NSString *) lang
 {
+    DBG1(@"[sr] recordAndRecognizeWithLang(%@)", lang);
     NSLocale *locale = [[NSLocale alloc] initWithLocaleIdentifier:lang];
     self.sfSpeechRecognizer = [[SFSpeechRecognizer alloc] initWithLocale:locale];
     if (!self.sfSpeechRecognizer) {
@@ -87,12 +183,19 @@ - (void) recordAndRecognizeWithLang:(NSString *) lang
         self.recognitionRequest = [[SFSpeechAudioBufferRecognitionRequest alloc] init];
         self.recognitionRequest.shouldReportPartialResults = [[self.command argumentAtIndex:1] boolValue];
 
+        self.speechStartSent = FALSE;
+
         self.recognitionTask = [self.sfSpeechRecognizer recognitionTaskWithRequest:self.recognitionRequest resultHandler:^(SFSpeechRecognitionResult *result, NSError *error) {
 
             if (error) {
-                NSLog(@"error");
+                NSLog(@"[sr] resultHandler error (%d) %@", (int) error.code, error.description);
                 [self stopAndRelease];
-                [self sendErrorWithMessage:error.localizedFailureReason andCode:error.code];
+                [self sendErrorWithMessage:error.localizedDescription andCode:3];
+            }
+
+            if(!self.speechStartSent) {
+                [self sendEvent:(NSString *)@"speechstart"];
+                self.speechStartSent = TRUE;
             }
 
             if (result) {
@@ -100,42 +203,57 @@ - (void) recordAndRecognizeWithLang:(NSString *) lang
                 int maxAlternatives = [[self.command argumentAtIndex:2] intValue];
                 for ( SFTranscription *transcription in result.transcriptions ) {
                     if (alternatives.count < maxAlternatives) {
-                        float confMed = 0;
+                        float confMed = 0, confidence;
                         for ( SFTranscriptionSegment *transcriptionSegment in transcription.segments ) {
-                            NSLog(@"transcriptionSegment.confidence %f", transcriptionSegment.confidence);
+                            //NSLog(@"[sr] transcriptionSegment.confidence %f", transcriptionSegment.confidence);
                             confMed +=transcriptionSegment.confidence;
                         }
                         NSMutableDictionary * resultDict = [[NSMutableDictionary alloc]init];
                         [resultDict setValue:transcription.formattedString forKey:@"transcript"];
                         [resultDict setValue:[NSNumber numberWithBool:result.isFinal] forKey:@"final"];
-                        [resultDict setValue:[NSNumber numberWithFloat:confMed/transcription.segments.count]forKey:@"confidence"];
+                        if(transcription.segments.count == 0) {
+                            DBG(@"*** No transcriptions for result!");
+                            confidence = 0;
+                        } else {
+                            confidence = confMed/transcription.segments.count;
+                        }
+                        [resultDict setValue:[NSNumber numberWithFloat:confidence] forKey:@"confidence"];
                         [alternatives addObject:resultDict];
                     }
                 }
                 [self sendResults:@[alternatives]];
                 if ( result.isFinal ) {
+                    if(self.speechStartSent) {
+                        [self sendEvent:(NSString *)@"speechend"];
+                        self.speechStartSent = FALSE;
+                    }
+
                     [self stopAndRelease];
                 }
             }
         }];
 
         AVAudioFormat *recordingFormat = [self.audioEngine.inputNode outputFormatForBus:0];
-
+        DBG1(@"[sr] recordingFormat: sampleRate:%lf", recordingFormat.sampleRate);
         [self.audioEngine.inputNode installTapOnBus:0 bufferSize:1024 format:recordingFormat block:^(AVAudioPCMBuffer * _Nonnull buffer, AVAudioTime * _Nonnull when) {
             [self.recognitionRequest appendAudioPCMBuffer:buffer];
-        }],
+        }];
 
         [self.audioEngine prepare];
         [self.audioEngine startAndReturnError:nil];
+
+        [self sendEvent:(NSString *)@"audiostart"];
     }
 }
 
 - (void) initAudioSession
 {
-    AVAudioSession *audioSession = [AVAudioSession sharedInstance];
-    [audioSession setCategory:AVAudioSessionCategoryRecord error:nil];
-    [audioSession setMode:AVAudioSessionModeMeasurement error:nil];
-    [audioSession setActive:YES withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:nil];
+    NSError *error;
+
+    if(![self.audioSession setActive:YES
+                         withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:&error]) {
+        NSLog(@"[sr] Unable to setActive:YES: %@", error);
+    }
 }
 
 - (BOOL) permissionIsSet
@@ -144,77 +262,106 @@ - (BOOL) permissionIsSet
     return status != SFSpeechRecognizerAuthorizationStatusNotDetermined;
 }
 
-- (void)recognition:(ISSpeechRecognition *)speechRecognition didGetRecognitionResult:(ISSpeechRecognitionResult *)result
-{
-    NSMutableDictionary * resultDict = [[NSMutableDictionary alloc]init];
-    [resultDict setValue:result.text forKey:@"transcript"];
-    [resultDict setValue:[NSNumber numberWithBool:YES] forKey:@"final"];
-    [resultDict setValue:[NSNumber numberWithFloat:result.confidence]forKey:@"confidence"];
-    NSArray * alternatives = @[resultDict];
-    NSArray * results = @[alternatives];
-    [self sendResults:results];
-
-}
-
--(void) recognition:(ISSpeechRecognition *)speechRecognition didFailWithError:(NSError *)error
-{
-    if (error.code == 28 || error.code == 23) {
-        [self sendErrorWithMessage:[error localizedDescription] andCode:7];
-    }
-}
-
 -(void) sendResults:(NSArray *) results
 {
     NSMutableDictionary * event = [[NSMutableDictionary alloc]init];
+    DBG(@"[sr] sendResults()");
     [event setValue:@"result" forKey:@"type"];
     [event setValue:nil forKey:@"emma"];
     [event setValue:nil forKey:@"interpretation"];
+    [event setValue:[NSNumber numberWithInt:0] forKey:@"resultIndex"];
     [event setValue:results forKey:@"results"];
 
     self.pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:event];
     [self.pluginResult setKeepCallbackAsBool:YES];
     [self.commandDelegate sendPluginResult:self.pluginResult callbackId:self.command.callbackId];
+    DBG(@"[sr] sendResults() complete");
 }
 
 -(void) sendErrorWithMessage:(NSString *)errorMessage andCode:(NSInteger) code
 {
     NSMutableDictionary * event = [[NSMutableDictionary alloc]init];
+    DBG2(@"[sr] sendErrorWithMessage: (%d) %@", (int) code, errorMessage);
     [event setValue:@"error" forKey:@"type"];
     [event setValue:[NSNumber numberWithInteger:code] forKey:@"error"];
     [event setValue:errorMessage forKey:@"message"];
     self.pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:event];
     [self.pluginResult setKeepCallbackAsBool:NO];
     [self.commandDelegate sendPluginResult:self.pluginResult callbackId:self.command.callbackId];
+    DBG(@"[sr] sendErrorWithMessage() complete");
+}
+
+-(void) sendEvent:(NSString *) eventType
+{
+    NSMutableDictionary * event = [[NSMutableDictionary alloc]init];
+    DBG1(@"[sr] sendEvent: %@", eventType);
+    [event setValue:eventType forKey:@"type"];
+    self.pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:event];
+    [self.pluginResult setKeepCallbackAsBool:YES];
+    [self.commandDelegate sendPluginResult:self.pluginResult callbackId:self.command.callbackId];
+    DBG(@"[sr] sendEvent() complete");
 }
 
 -(void) stop:(CDVInvokedUrlCommand*)command
 {
+    DBG(@"[sr] stop()");
     [self stopOrAbort];
 }
 
 -(void) abort:(CDVInvokedUrlCommand*)command
 {
+    DBG(@"[sr] abort()");
     [self stopOrAbort];
 }
 
 -(void) stopOrAbort
 {
-    if (NSClassFromString(@"SFSpeechRecognizer")) {
-        if (self.audioEngine.isRunning) {
-            [self.audioEngine stop];
+    DBG(@"[sr] stopOrAbort()");
+    if (self.audioEngine.isRunning) {
+        [self.audioEngine stop];
+        [self sendEvent:(NSString *)@"audioend"];
+
+        if(self.recognitionRequest) {
             [self.recognitionRequest endAudio];
         }
-    } else {
-        [self.iSpeechRecognition cancel];
     }
 }
 
 -(void) stopAndRelease
 {
-    [self.audioEngine stop];
+    DBG(@"[sr] stopAndRelease()");
+    if (self.audioEngine.isRunning) {
+        [self.audioEngine stop];
+        [self sendEvent:(NSString *)@"audioend"];
+    }
     [self.audioEngine.inputNode removeTapOnBus:0];
-    self.recognitionRequest = nil;
-    self.recognitionTask = nil;
+
+    if(self.recognitionRequest) {
+        [self.recognitionRequest endAudio];
+        self.recognitionRequest = nil;
+    }
+
+    if(self.recognitionTask) {
+        if(self.recognitionTask.state != SFSpeechRecognitionTaskStateCompleted) {
+            [self.recognitionTask cancel];
+        }
+        self.recognitionTask = nil;
+    }
+
+    /* TODO: Disabled for now.
+     * Maybe should be performed by HeadsetControl.disconnect???
+     * Or maybe allow use of a plugin parameter/option to disable this???
+    if(self.audioSession) {
+        NSError *error;
+
+        NSLog(@"setActive:NO");
+        if(![self.audioSession setActive:NO withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:&error]) {
+            NSLog(@"[sr] Unable to setActive:NO: %@", error);
+        }
+    }
+    */
+
+    [self sendEvent:(NSString *)@"end"];
 }
 
 @end
diff --git a/src/ios/iSpeechSDK.bundle/ISPopupBackground.png b/src/ios/iSpeechSDK.bundle/ISPopupBackground.png
deleted file mode 100755
index 5afd6f7..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ISPopupBackground.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ISPopupBackground@2x.png b/src/ios/iSpeechSDK.bundle/ISPopupBackground@2x.png
deleted file mode 100755
index 0e5885a..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ISPopupBackground@2x.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ISPopupButton.png b/src/ios/iSpeechSDK.bundle/ISPopupButton.png
deleted file mode 100755
index c364255..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ISPopupButton.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ISPopupButton@2x.png b/src/ios/iSpeechSDK.bundle/ISPopupButton@2x.png
deleted file mode 100755
index 5391125..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ISPopupButton@2x.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ISPopupButtonPress.png b/src/ios/iSpeechSDK.bundle/ISPopupButtonPress.png
deleted file mode 100755
index b078198..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ISPopupButtonPress.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ISPopupButtonPress@2x.png b/src/ios/iSpeechSDK.bundle/ISPopupButtonPress@2x.png
deleted file mode 100755
index a741229..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ISPopupButtonPress@2x.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ISPopupDefaultButton.png b/src/ios/iSpeechSDK.bundle/ISPopupDefaultButton.png
deleted file mode 100755
index 88710c8..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ISPopupDefaultButton.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ISPopupDefaultButton@2x.png b/src/ios/iSpeechSDK.bundle/ISPopupDefaultButton@2x.png
deleted file mode 100755
index 1d61c1b..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ISPopupDefaultButton@2x.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/Info.plist b/src/ios/iSpeechSDK.bundle/Info.plist
deleted file mode 100755
index 02cb0ef..0000000
Binary files a/src/ios/iSpeechSDK.bundle/Info.plist and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/Thumbs.db b/src/ios/iSpeechSDK.bundle/Thumbs.db
deleted file mode 100755
index 0f20dbd..0000000
Binary files a/src/ios/iSpeechSDK.bundle/Thumbs.db and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ar.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/ar.lproj/Localizable.strings
deleted file mode 100755
index e23098d..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ar.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/cs.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/cs.lproj/Localizable.strings
deleted file mode 100755
index 1092f3e..0000000
Binary files a/src/ios/iSpeechSDK.bundle/cs.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/da.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/da.lproj/Localizable.strings
deleted file mode 100755
index 12899ac..0000000
Binary files a/src/ios/iSpeechSDK.bundle/da.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/de.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/de.lproj/Localizable.strings
deleted file mode 100755
index f3b1fc5..0000000
Binary files a/src/ios/iSpeechSDK.bundle/de.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/en.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/en.lproj/Localizable.strings
deleted file mode 100755
index 6203e93..0000000
Binary files a/src/ios/iSpeechSDK.bundle/en.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/es.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/es.lproj/Localizable.strings
deleted file mode 100755
index 6000032..0000000
Binary files a/src/ios/iSpeechSDK.bundle/es.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/fail.wav b/src/ios/iSpeechSDK.bundle/fail.wav
deleted file mode 100755
index 3cae02b..0000000
Binary files a/src/ios/iSpeechSDK.bundle/fail.wav and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/failed.png b/src/ios/iSpeechSDK.bundle/failed.png
deleted file mode 100755
index b85abfd..0000000
Binary files a/src/ios/iSpeechSDK.bundle/failed.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/failed@2x.png b/src/ios/iSpeechSDK.bundle/failed@2x.png
deleted file mode 100755
index 99d5c2b..0000000
Binary files a/src/ios/iSpeechSDK.bundle/failed@2x.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/fi.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/fi.lproj/Localizable.strings
deleted file mode 100755
index 59dd87b..0000000
Binary files a/src/ios/iSpeechSDK.bundle/fi.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/fr.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/fr.lproj/Localizable.strings
deleted file mode 100755
index bed8474..0000000
Binary files a/src/ios/iSpeechSDK.bundle/fr.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/hu.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/hu.lproj/Localizable.strings
deleted file mode 100755
index 2812f10..0000000
Binary files a/src/ios/iSpeechSDK.bundle/hu.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/iSpeechLogo.png b/src/ios/iSpeechSDK.bundle/iSpeechLogo.png
deleted file mode 100755
index 7d0ffd9..0000000
Binary files a/src/ios/iSpeechSDK.bundle/iSpeechLogo.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/iSpeechLogo@2x.png b/src/ios/iSpeechSDK.bundle/iSpeechLogo@2x.png
deleted file mode 100755
index 82a7c16..0000000
Binary files a/src/ios/iSpeechSDK.bundle/iSpeechLogo@2x.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/it.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/it.lproj/Localizable.strings
deleted file mode 100755
index 694a8c9..0000000
Binary files a/src/ios/iSpeechSDK.bundle/it.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ja.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/ja.lproj/Localizable.strings
deleted file mode 100755
index aa56523..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ja.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ko.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/ko.lproj/Localizable.strings
deleted file mode 100755
index e79428f..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ko.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/microphone.png b/src/ios/iSpeechSDK.bundle/microphone.png
deleted file mode 100755
index 4b2b566..0000000
Binary files a/src/ios/iSpeechSDK.bundle/microphone.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/microphone@2x.png b/src/ios/iSpeechSDK.bundle/microphone@2x.png
deleted file mode 100755
index cf52194..0000000
Binary files a/src/ios/iSpeechSDK.bundle/microphone@2x.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/nb.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/nb.lproj/Localizable.strings
deleted file mode 100755
index 1614081..0000000
Binary files a/src/ios/iSpeechSDK.bundle/nb.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/nl.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/nl.lproj/Localizable.strings
deleted file mode 100755
index e29af8b..0000000
Binary files a/src/ios/iSpeechSDK.bundle/nl.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/pl.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/pl.lproj/Localizable.strings
deleted file mode 100755
index 63a2ae7..0000000
Binary files a/src/ios/iSpeechSDK.bundle/pl.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/pt-PT.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/pt-PT.lproj/Localizable.strings
deleted file mode 100755
index 1e73f31..0000000
Binary files a/src/ios/iSpeechSDK.bundle/pt-PT.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/pt.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/pt.lproj/Localizable.strings
deleted file mode 100755
index 354a28c..0000000
Binary files a/src/ios/iSpeechSDK.bundle/pt.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/ru.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/ru.lproj/Localizable.strings
deleted file mode 100755
index 7c7c587..0000000
Binary files a/src/ios/iSpeechSDK.bundle/ru.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/startRecord.wav b/src/ios/iSpeechSDK.bundle/startRecord.wav
deleted file mode 100755
index 486f72b..0000000
Binary files a/src/ios/iSpeechSDK.bundle/startRecord.wav and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/stopRecord.wav b/src/ios/iSpeechSDK.bundle/stopRecord.wav
deleted file mode 100755
index 890ead7..0000000
Binary files a/src/ios/iSpeechSDK.bundle/stopRecord.wav and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/success.png b/src/ios/iSpeechSDK.bundle/success.png
deleted file mode 100755
index 048aecf..0000000
Binary files a/src/ios/iSpeechSDK.bundle/success.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/success.wav b/src/ios/iSpeechSDK.bundle/success.wav
deleted file mode 100755
index 63e5737..0000000
Binary files a/src/ios/iSpeechSDK.bundle/success.wav and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/success@2x.png b/src/ios/iSpeechSDK.bundle/success@2x.png
deleted file mode 100755
index c18c4ee..0000000
Binary files a/src/ios/iSpeechSDK.bundle/success@2x.png and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/sv.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/sv.lproj/Localizable.strings
deleted file mode 100755
index d41617b..0000000
Binary files a/src/ios/iSpeechSDK.bundle/sv.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/tr.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/tr.lproj/Localizable.strings
deleted file mode 100755
index 7752771..0000000
Binary files a/src/ios/iSpeechSDK.bundle/tr.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/zh-Hans.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/zh-Hans.lproj/Localizable.strings
deleted file mode 100755
index 0b725e3..0000000
Binary files a/src/ios/iSpeechSDK.bundle/zh-Hans.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/iSpeechSDK.bundle/zh-Hant.lproj/Localizable.strings b/src/ios/iSpeechSDK.bundle/zh-Hant.lproj/Localizable.strings
deleted file mode 100755
index 29a6bc9..0000000
Binary files a/src/ios/iSpeechSDK.bundle/zh-Hant.lproj/Localizable.strings and /dev/null differ
diff --git a/src/ios/libiSpeechSDK.a b/src/ios/libiSpeechSDK.a
deleted file mode 100644
index 22c6b15..0000000
Binary files a/src/ios/libiSpeechSDK.a and /dev/null differ
diff --git a/www/SpeechRecognition.js b/www/SpeechRecognition.js
index c666734..142a9a3 100644
--- a/www/SpeechRecognition.js
+++ b/www/SpeechRecognition.js
@@ -36,7 +36,37 @@ var SpeechRecognition = function () {
     }, "SpeechRecognition", "init", []);
 };
 
-SpeechRecognition.prototype.start = function() {
+function _formatResultEvent(ev) {
+    var event = new SpeechRecognitionEvent();
+
+    event.type = ev.type;
+    event.resultIndex = ev.resultIndex;
+    event.emma = ev.emma;
+    event.interpretation = ev.interpretation;
+
+    for (var i = 0; i < ev.results.length; i++) {
+        var result = new SpeechRecognitionResult();
+        var alt = ev.results[i];
+
+        for (var j = 0; j < alt.length; j++) {
+            var alternative = new SpeechRecognitionAlternative();
+
+            alternative.transcript = alt[j].transcript;
+            alternative.confidence = alt[j].confidence;
+            if (alt[j].final) {
+                result.isFinal = true;
+            }
+
+            result.push(alternative);
+        }
+
+        event.results.push(result);
+    }
+
+    return event;
+}
+
+SpeechRecognition.prototype.start = function () {
     var that = this;
     var successCallback = function(event) {
         if (event.type === "audiostart" && typeof that.onaudiostart === "function") {
@@ -52,9 +82,9 @@ SpeechRecognition.prototype.start = function() {
         } else if (event.type === "audioend" && typeof that.onaudioend === "function") {
             that.onaudioend(event);
         } else if (event.type === "result" && typeof that.onresult === "function") {
-            that.onresult(event);
+            that.onresult(_formatResultEvent(event));
         } else if (event.type === "nomatch" && typeof that.onnomatch === "function") {
-            that.onnomatch(event);
+            that.onnomatch(_formatResultEvent(event));
         } else if (event.type === "start" && typeof that.onstart === "function") {
             that.onstart(event);
         } else if (event.type === "end" && typeof that.onend === "function") {
@@ -63,11 +93,16 @@ SpeechRecognition.prototype.start = function() {
     };
     var errorCallback = function(err) {
         if (typeof that.onerror === "function") {
-            that.onerror(err);
+            var error = new SpeechRecognitionError();
+
+            error.error = SpeechRecognitionError._errorCodes[err.error];
+            error.message = err.message;
+
+            that.onerror(error);
         }
     };
 
-    exec(successCallback, errorCallback, "SpeechRecognition", "start", [this.lang, this.interimResults, this.maxAlternatives]);
+    exec(successCallback, errorCallback, "SpeechRecognition", "start", [this.lang, this.interimResults, this.maxAlternatives, this.serviceURI]);
 };
 
 SpeechRecognition.prototype.stop = function() {
diff --git a/www/SpeechRecognitionAlternative.js b/www/SpeechRecognitionAlternative.js
index ba8152f..7b114db 100644
--- a/www/SpeechRecognitionAlternative.js
+++ b/www/SpeechRecognitionAlternative.js
@@ -1,6 +1,7 @@
 var SpeechRecognitionAlternative = function() {
     this.transcript = null;
     this.confidence = 0.0;
+    // this.final may be present for backwards compatibility with v0.3.0 of this plugin.
 };
 
 module.exports = SpeechRecognitionAlternative;
diff --git a/www/SpeechRecognitionError.js b/www/SpeechRecognitionError.js
index 96b8a71..b82d36a 100644
--- a/www/SpeechRecognitionError.js
+++ b/www/SpeechRecognitionError.js
@@ -1,4 +1,5 @@
-var SpeechRecognitionError = function() {
+var SpeechRecognitionError = function () {
+    this.type = "error";
     this.error = null;
     this.message = null;
 };
@@ -12,4 +13,15 @@ SpeechRecognitionError['service-not-allowed'] = 5;
 SpeechRecognitionError['bad-grammar'] = 6;
 SpeechRecognitionError['language-not-supported'] = 7;
 
+SpeechRecognitionError._errorCodes = [
+    'no-speech',
+    'aborted',
+    'audio-capture',
+    'network',
+    'not-allowed',
+    'service-not-allowed',
+    'bad-grammar',
+    'language-not-supported'
+];
+
 module.exports = SpeechRecognitionError;
diff --git a/www/SpeechRecognitionEvent.js b/www/SpeechRecognitionEvent.js
index 4ca0cab..dea25c6 100644
--- a/www/SpeechRecognitionEvent.js
+++ b/www/SpeechRecognitionEvent.js
@@ -1,8 +1,9 @@
-var SpeechRecognitionEvent = function() {
-    this.resultIndex;
-    this.results;
-    this.interpretation;
-    this.emma;
+var SpeechRecognitionEvent = function () {
+    this.type = "result";
+    this.resultIndex = 0;
+    this.results = new SpeechRecognitionResultList();
+    this.interpretation = null;
+    this.emma = null;
 };
 
 module.exports = SpeechRecognitionEvent;
diff --git a/www/SpeechRecognitionResult.js b/www/SpeechRecognitionResult.js
index 8370f67..6a21171 100644
--- a/www/SpeechRecognitionResult.js
+++ b/www/SpeechRecognitionResult.js
@@ -1,12 +1,16 @@
 // A complete one-shot simple response
-var SpeechRecognitionResult = function() {
-    this._result = [];
-    this.length = 0;
-    this.final = false;
+// An extension of the Array object to also operate similarly to Chrome's implementation.
+var SpeechRecognitionResult = function () {
+    Array.call(this);
+
+    this.isFinal = false;
 };
 
-SpeechRecognitionResult.prototype.item = function(item) {
-    return this._result[item];
+SpeechRecognitionResult.prototype = new Array;
+SpeechRecognitionResult.prototype.constructor = SpeechRecognitionResult;
+
+SpeechRecognitionResult.prototype.item = function (item) {
+    return this[item];
 };
 
 module.exports = SpeechRecognitionResult;
diff --git a/www/SpeechRecognitionResultList.js b/www/SpeechRecognitionResultList.js
index 69ccfa5..98c5ea5 100644
--- a/www/SpeechRecognitionResultList.js
+++ b/www/SpeechRecognitionResultList.js
@@ -1,11 +1,11 @@
 // A collection of responses (used in continuous mode)
-var SpeechRecognitionResultList = function() {
-    this._result = [];
-    this.length = 0;
-};
+// An extension of the Array object to also operate similarly to Chrome's implementation.
+var SpeechRecognitionResultList = function() {};
+
+SpeechRecognitionResultList.prototype = new Array;
 
-SpeechRecognitionResultList.prototype.item = function(item) {
-    return this._result[item];
+SpeechRecognitionResultList.prototype.item = function (item) {
+    return this[item];
 };
 
 module.exports = SpeechRecognitionResultList;