diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index 9cbcf938..138d11c6 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -254,12 +254,12 @@ exports.commands = [{
     readOnly: true
 }, {
     name: "togglerecording",
-    bindKey: bindKey("Ctrl-Shift-E", "Ctrl-Shift-E"),
+    bindKey: bindKey("Ctrl-Alt-E", "Command-Option-E"),
     exec: function(editor) { editor.commands.toggleRecording(); },
     readOnly: true
 }, {
     name: "replaymacro",
-    bindKey: bindKey("Ctrl-E", "Ctrl-E"),
+    bindKey: bindKey("Ctrl-Shift-E", "Command-Shift-E"),
     exec: function(editor) { editor.commands.replay(editor); },
     readOnly: true
 }, 
diff --git a/lib/ace/keyboard/keybinding.js b/lib/ace/keyboard/keybinding.js
index e1ab4faf..9caa76da 100644
--- a/lib/ace/keyboard/keybinding.js
+++ b/lib/ace/keyboard/keybinding.js
@@ -39,7 +39,6 @@
 
 define(function(require, exports, module) {
 
-var useragent = require("../lib/useragent");
 var keyUtil  = require("../lib/keys");
 var event = require("../lib/event");
 require("../commands/default_commands");
@@ -76,8 +75,9 @@ var KeyBinding = function(editor) {
     };
 
     this.$callKeyboardHandlers = function (hashId, keyString, keyCode, e) {
+        var toExecute;
         for (var i = this.$handlers.length; i--;) {
-            var toExecute = this.$handlers[i].handleKeyboard(
+            toExecute = this.$handlers[i].handleKeyboard(
                 this.$data, hashId, keyString, keyCode, e
             );
             if (toExecute && toExecute.command)
@@ -97,13 +97,13 @@ var KeyBinding = function(editor) {
         if (success && e)
             event.stopEvent(e);
 
-        return success
+        return success;
     };
 
     this.handleKeyboard = function(data, hashId, keyString) {
         return {
             command: this.$editor.commands.findKeyCommand(hashId, keyString)
-        }
+        };
     };
 
     this.onCommandKey = function(e, hashId, keyCode) {
diff --git a/lib/ace/keyboard/textinput.js b/lib/ace/keyboard/textinput.js
index 5acdb861..b828dcf6 100644
--- a/lib/ace/keyboard/textinput.js
+++ b/lib/ace/keyboard/textinput.js
@@ -47,7 +47,7 @@ var TextInput = function(parentNode, host) {
 
     var text = dom.createElement("textarea");
     if (useragent.isTouchPad)
-    	text.setAttribute("x-palm-disable-auto-cap", true);
+        text.setAttribute("x-palm-disable-auto-cap", true);
         
     text.style.left = "-10000px";
     parentNode.appendChild(text);
@@ -201,7 +201,7 @@ var TextInput = function(parentNode, host) {
                     clipboardData.setData("Text", copyText);
                     host.onCut();
                 }
-                event.preventDefault(e)
+                event.preventDefault(e);
             }
         });
     }
@@ -213,10 +213,10 @@ var TextInput = function(parentNode, host) {
     event.addListener(text, "compositionstart", onCompositionStart);
     if (useragent.isGecko) {
         event.addListener(text, "text", onCompositionUpdate);
-    };
+    }
     if (useragent.isWebKit) {
         event.addListener(text, "keyup", onCompositionUpdate);
-    };
+    }
     event.addListener(text, "compositionend", onCompositionEnd);
 
     event.addListener(text, "blur", function() {
@@ -240,7 +240,7 @@ var TextInput = function(parentNode, host) {
 
     function isFocused() {
         return document.activeElement === text;
-    };
+    }
     this.isFocused = isFocused;
 
     this.getElement = function() {
@@ -254,12 +254,12 @@ var TextInput = function(parentNode, host) {
                 
             text.style.cssText = 
                 'position:fixed; z-index:1000;' +
-                'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;'
+                'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;';
 
         }
         if (isEmpty)
             text.value='';
-    }
+    };
 
     this.onContextMenuClose = function(){
         setTimeout(function () {
@@ -269,7 +269,7 @@ var TextInput = function(parentNode, host) {
             }
             sendText();
         }, 0);
-    }
+    };
 };
 
 exports.TextInput = TextInput;