diff --git a/lib/ace/mode/lsl.js b/lib/ace/mode/lsl.js
index f839ef16..a10acd0e 100644
--- a/lib/ace/mode/lsl.js
+++ b/lib/ace/mode/lsl.js
@@ -42,7 +42,7 @@ var oop = require("../lib/oop");
 
 var Mode = function() {
     this.$tokenizer = new Tokenizer(new Rules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
+    this.$outdent = new Outdent();
     this.$behaviour = new CstyleBehaviour();
     this.foldingRules = new CStyleFoldMode();
 };
diff --git a/lib/ace/mode/lsl_highlight_rules.js b/lib/ace/mode/lsl_highlight_rules.js
index ca85351d..3c038fd8 100644
--- a/lib/ace/mode/lsl_highlight_rules.js
+++ b/lib/ace/mode/lsl_highlight_rules.js
@@ -39,7 +39,7 @@ define(function(require, exports, module) {
     function LSLHighlightRules() {
         var keywordMapper = this.createKeywordMapper({
             "constant.language.float.lsl" : "DEG_TO_RAD|PI|PI_BY_TWO|RAD_TO_DEG|SQRT2|TWO_PI",
-            "constant.language.integer.lsl": "ACTIVE ALWAYS_RUN|AGENT_ATTACHMENTS|AGENT_AUTOPILOT|" +
+            "constant.language.integer.lsl": "ACTIVE|ALWAYS_RUN|AGENT_ATTACHMENTS|AGENT_AUTOPILOT|" +
                 "AGENT_AWAY|AGENT_BUSY|AGENT_BY_LEGACY_NAME|AGENT_BY_USERNAME|AGENT_CROUCHING|" +
                 "AGENT_FLYING|AGENT_IN_AIR|AGENT_LIST_PARCEL|AGENT_LIST_PARCEL_OWNER|" +
                 "AGENT_LIST_REGION|AGENT_MOUSELOOK|AGENT_ON_OBJECT|AGENT_SCRIPTED|AGENT_SITTING|" +
@@ -297,7 +297,7 @@ define(function(require, exports, module) {
                     next : [
                         { token : "constant.language.escape.lsl", regex : "\\[tn\"\\]" }
                     ]
-                } {
+                }, {
                     token : "constant.numeric.lsl",
                     regex : "(0[xX][0-9a-fA-F]+|[+-]?[0-9]+(?:(?:\\.[0-9]*)?(?:[eE][+-]?[0-9]+)?)?)\\b"
                 }, {
@@ -308,7 +308,7 @@ define(function(require, exports, module) {
                     regex : "\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
                 }, {
                     token : "support.function.user-defined.lsl",
-                    regex : "(?:\w+\s+)?(\w+)?\s*(?=\(.*?\))"
+                    regex : "(?:\w+\s+)?(\w+)?\s*(?=\(.*?\))"                   // apparently some bad esape?
                 }, {
                     token : "keyword.operator.lsl",
                     regex : "\\+\\+|\\-\\-|<<|>>|&&?|\\|\\|?|\\^|~|[!%<>=*+\\-\\/]=?"