diff --git a/content/commands.js b/content/commands.js
index af18a6ed..ec556f4b 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1645,7 +1645,7 @@ vimperator.Commands = function () //{{{
         {
             usage: ["qma[rk] {a-zA-Z0-9} [url]"],
             shortHelp: "Mark a URL with a letter for quick access",
-            help: "You can also mark whole groups like this: <br/>"+
+            help: "You can also mark whole groups like this: <br/>" +
                   "<code class=\"command\">:qmark f http://forum1.com, http://forum2.com, imdb some artist</code>"
         }
     ));
diff --git a/content/help.js b/content/help.js
index d227ba19..03905fee 100644
--- a/content/help.js
+++ b/content/help.js
@@ -177,7 +177,7 @@ vimperator.help = function (section, easter) //{{{
         '<var>$VIMPERATOR_HOME</var> can be used to override the calculated <var>$HOME</var> directory.';
 
     var mappings = '<span style="float: right"><code class="tag">mappings</code></span><h2 id="mappings">Mappings</h2>' +
-        '<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>'+
+        '<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>' +
         '<table class="vimperator mappings">';
     mappings += makeHelpString(vimperator.mappings, "", "", null);
     mappings += '</table>';
diff --git a/content/mappings.js b/content/mappings.js
index 92a83f98..49dde1ac 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -107,17 +107,19 @@ vimperator.Mappings = function () //{{{
         main[mode] = [];
         user[mode] = [];
     }
+    //vimperator.modes.forEach(function (mode) { main[mode] = user[mode] = []; });
 
     function addDefaultMap(map)
     {
-        for (var i = 0; i < map.modes.length; i++)
-        {
-            var mode = map.modes[i];
-            if (!main[mode])
-                main[mode] = [];
+        //for (var i = 0; i < map.modes.length; i++)
+        //{
+        //    var mode = map.modes[i];
+        //    //if (!main[mode])
+        //    //    main[mode] = [];
 
-            main[mode].push(map);
-        }
+        //    main[mode].push(map);
+        //}
+        map.modes.forEach(function (mode) { main[mode].push(map) });
     }
 
     function getMap(mode, cmd, stack)
@@ -1147,7 +1149,7 @@ vimperator.Mappings = function () //{{{
                   "<li><code class=\"mapping\">y</code> to yank its location</li>" +
                   "<li><code class=\"mapping\">Y</code> to yank its text description</li>" +
                   "</ul>" +
-                  "Additionally there are two <code class='argument'>{mode}</code>s, which will start an AlwaysHint mode:<br/>"+
+                  "Additionally there are two <code class='argument'>{mode}</code>s, which will start an AlwaysHint mode:<br/>" +
                   "<ul>" +
                   "<li><code class=\"mapping\">f</code> to open its location in the current tab</li>" +
                   "<li><code class=\"mapping\">F</code> to open its location in a new tab</li>" +
diff --git a/content/options.js b/content/options.js
index fba06a92..c1852729 100644
--- a/content/options.js
+++ b/content/options.js
@@ -477,7 +477,7 @@ vimperator.Options = function () //{{{
             shortHelp: "Set the external text editor",
             help: "Sets the editor to run when <code class=\"mapping\">&lt;C-i&gt;</code> " +
                   "is pressed in INSERT and TEXTAREA modes. Note that Vimperator will " +
-                  "not behave correctly if the editor forks its own process, such as with "+
+                  "not behave correctly if the editor forks its own process, such as with " +
                   "gvim without the -f argument.",
             defaultValue: "gvim -f"
         }
@@ -631,7 +631,7 @@ vimperator.Options = function () //{{{
                   "<ul>" +
                   "<li><b>0</b>: Force to open in the current tab (NOTE: this can stop some web sites from working correctly!)</li>" +
                   "<li><b>1</b>: Always open in a new tab</li>" +
-                  "<li><b>2</b>: Open in a new window if it has a specific requested size (default in Firefox)</li>"+
+                  "<li><b>2</b>: Open in a new window if it has a specific requested size (default in Firefox)</li>" +
                   "<li><b>3</b>: Always open in a new window</li>" +
                   "</ul>" +
                   "NOTE: This option does not change the popup blocker of Firefox in any way.",