diff --git a/README.md b/README.md
index fa0da3639..331353a3b 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ documented codebase makes it easier for developers to improve the code and contr
 
 
 Etherpad Lite is designed to be easily embeddable and provides a [HTTP API](https://github.com/ether/etherpad-lite/wiki/HTTP-API) 
-that allows your web application to manage pads, users and groups. It is recommended to use the [available client implementations](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries) in order to interact with this API. There is also a [jQuery plugin](https://github.com/johnyma22/etherpad-lite-jquery-plugin) that helps you to embed Pads into your website.
+that allows your web application to manage pads, users and groups. It is recommended to use the [available client implementations](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries) in order to interact with this API. There is also a [jQuery plugin](https://github.com/ether/etherpad-lite-jquery-plugin) that helps you to embed Pads into your website.
 There's also a full-featured plugin framework, allowing you to easily add your own features.
 Finally, Etherpad Lite comes with translations into tons of different languages!
 
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 70b5443bd..25cb1f8cc 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -1622,9 +1622,17 @@ function Ace2Inner(){
         lines = ccData.lines;
         var lineAttribs = ccData.lineAttribs;
         var linesWrapped = ccData.linesWrapped;
+        var scrollToTheLeftNeeded = false;
 
         if (linesWrapped > 0)
         {
+          if(!browser.ie){
+            // chrome decides in it's infinite wisdom that its okay to put the browsers visisble window in the middle of the span
+            // an outcome of this is that the first chars of the string are no longer visible to the user..  Yay chrome..
+            // Move the browsers visible area to the left hand side of the span
+            // Firefox isn't quite so bad, but it's still pretty quirky.
+            var scrollToTheLeftNeeded = true;
+          }
           // console.log("Editor warning: " + linesWrapped + " long line" + (linesWrapped == 1 ? " was" : "s were") + " hard-wrapped into " + ccData.numLinesAfter + " lines.");
         }
 
@@ -1692,6 +1700,10 @@ function Ace2Inner(){
       //console.log("removed: "+id);
     });
 
+    if(scrollToTheLeftNeeded){ // needed to stop chrome from breaking the ui when long strings without spaces are pasted
+      $("#innerdocbody").scrollLeft(0);
+    }
+
     p.mark("findsel");
     // if the nodes that define the selection weren't encountered during
     // content collection, figure out where those nodes are now.
@@ -1897,7 +1909,7 @@ function Ace2Inner(){
       var prevLine = rep.lines.prev(thisLine);
       var prevLineText = prevLine.text;
       var theIndent = /^ *(?:)/.exec(prevLineText)[0];
-      if (/[\[\(\{]\s*$/.exec(prevLineText)) theIndent += THE_TAB;
+      if (/[\[\(\:\{]\s*$/.exec(prevLineText)) theIndent += THE_TAB;
       var cs = Changeset.builder(rep.lines.totalWidth()).keep(
       rep.lines.offsetOfIndex(lineNum), lineNum).insert(
       theIndent, [
@@ -3287,7 +3299,7 @@ function Ace2Inner(){
       listType = /([a-z]+)([12345678])/.exec(listType);
       var type  = listType[1];
       var level = Number(listType[2]);
-      
+
       //detect empty list item; exclude indentation
       if(text === '*' && type !== "indent")
       {
@@ -3317,8 +3329,10 @@ function Ace2Inner(){
 
   function doIndentOutdent(isOut)
   {
-    if (!(rep.selStart && rep.selEnd) ||
-        ((rep.selStart[0] == rep.selEnd[0]) && (rep.selStart[1] == rep.selEnd[1]) &&  rep.selEnd[1] > 1))
+    if (!((rep.selStart && rep.selEnd) ||
+        ((rep.selStart[0] == rep.selEnd[0]) && (rep.selStart[1] == rep.selEnd[1]) &&  rep.selEnd[1] > 1)) &&
+        (isOut != true)
+       )
     {
       return false;
     }
@@ -3326,7 +3340,6 @@ function Ace2Inner(){
     var firstLine, lastLine;
     firstLine = rep.selStart[0];
     lastLine = Math.max(firstLine, rep.selEnd[0] - ((rep.selEnd[1] === 0) ? 1 : 0));
-
     var mods = [];
     for (var n = firstLine; n <= lastLine; n++)
     {
diff --git a/src/static/js/l10n.js b/src/static/js/l10n.js
index a67a7c1a4..c79ea706d 100644
--- a/src/static/js/l10n.js
+++ b/src/static/js/l10n.js
@@ -1,8 +1,8 @@
 (function(document) {
   // Set language for l10n
-  var language = document.cookie.match(/language=((\w{2,3})(-w+)?)/);
+  var language = document.cookie.match(/language=((\w{2,3})(-\w+)?)/);
   if(language) language = language[1];
-  
+
   html10n.bind('indexed', function() {
     html10n.localize([language, navigator.language, navigator.userLanguage, 'en'])
   })
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 91a07bf96..cc9f8758c 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -156,10 +156,7 @@ var padeditbar = (function()
             else if (cmd == 'insertorderedlist') ace.ace_doInsertOrderedList();
             else if (cmd == 'indent')
             {
-              if (!ace.ace_doIndentOutdent(false))
-              {
-                ace.ace_doInsertUnorderedList();
-              }
+              ace.ace_doIndentOutdent(false);
             }
             else if (cmd == 'outdent')
             {