diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index c949f620..f2ca2ee9 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -213,7 +213,6 @@ var workspace = Blockly.inject(blocklyDiv,{
   toolbox: document.getElementById('toolbox'),
   zoom:{
     controls: true,
-    wheel: true,//false
     startScale: 1.0,
     maxScale: 3,
     minScale: 0.3,
diff --git a/_server/editor_multi.js b/_server/editor_multi.js
index 507f53ca..a72d28be 100644
--- a/_server/editor_multi.js
+++ b/_server/editor_multi.js
@@ -9,17 +9,20 @@ var codeEditor = CodeMirror.fromTextArea(document.getElementById("multiLineCode"
   tabSize: 4,
   indentWithTabs: true,
   smartIndent: true,
-  mode: {name: "javascript", json: true, globalVars: true},
+  mode: {name: "javascript", globalVars: true, localVars: true},
   lineWrapping: true,
   continueComments: "Enter",
   gutters: ["CodeMirror-lint-markers"],
   lint: true,
+  autocomplete: true,
   extraKeys: {"Ctrl-Q": "toggleComment"},
 });
 
 codeEditor.on("keyup", function (cm, event) {
-  if ((event.keyCode >= 65 && event.keyCode<=90) || (event.keyCode>=49 && event.keyCode<=57) || event.keyCode==190) {
+  if (codeEditor.getOption("autocomplete") && (event.keyCode >= 65 && event.keyCode<=90) || (event.keyCode>=49 && event.keyCode<=57) || event.keyCode==190) {
+    try {
       CodeMirror.commands.autocomplete(cm, null, {completeSingle: false});
+    } catch (e) {}
   }
 });