diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index f109b336..d12478a3 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -311,7 +311,7 @@ exports.commands = [{
     multiSelectAction: "forEach"
 }, {
     name: "togglecomment",
-    bindKey: bindKey("Ctrl-7", "Command-7"),
+    bindKey: bindKey("Ctrl-/", "Command-/"),
     exec: function(editor) { editor.toggleCommentLines(); },
     multiSelectAction: "forEach"
 }, {
diff --git a/lib/ace/keyboard/keybinding.js b/lib/ace/keyboard/keybinding.js
index 6e6656d5..310a9b74 100644
--- a/lib/ace/keyboard/keybinding.js
+++ b/lib/ace/keyboard/keybinding.js
@@ -93,7 +93,7 @@ var KeyBinding = function(editor) {
 
         // allow keyboardHandler to consume keys
         if (toExecute.command != "null")
-            success = commands.exec(toExecute.command, this.$editor, toExecute.args);
+            success = commands.exec(toExecute.command, this.$editor, toExecute.args, e);
         else
             success = true;
 
diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 66e35222..c8af523f 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -746,7 +746,7 @@ var VirtualRenderer = function(container, theme) {
         if (center)
             offset -= this.$size.scrollerHeight / 2;
 
-        if (this.$animatedScroll && Math.abs(offset - this.scrollTop) < 10000) {
+        if (this.$animatedScroll && Math.abs(offset - this.scrollTop) < 100000) {
             var _self = this;
             var steps = _self.$calcSteps(this.scrollTop, offset);