diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 9afd66ab..41b6c18d 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -616,7 +616,7 @@ function Commands() //{{{
         {
             usage: ["map {lhs} {rhs}", "map {lhs}", "map"],
             short_help: "Map the key sequence {lhs} to {rhs}",
-            help: "The {rhs} is remapped, allowing for nested and recursive mappings.<br/>" +
+            help: "The <code class=\"argument\">{rhs}</code> is remapped, allowing for nested and recursive mappings.<br/>" +
                   "Mappings are NOT saved during sessions, make sure you put them in your vimperatorrc file!"
         }
     ));
@@ -750,7 +750,7 @@ function Commands() //{{{
         {
             usage: ["no[remap] {lhs} {rhs}", "no[remap] {lhs}", "no[remap]"],
             short_help: "Map the key sequence {lhs} to {rhs}",
-            help: "No remapping of the {rhs} is performed.<br/> NOTE: :noremap does not yet work as reliably as :map."
+            help: "No remapping of the <code class=\"argument\">{rhs}</code> is performed.<br/>NOTE: :noremap does not yet work as reliably as :map."
         }
     ));
     addDefaultCommand(new Command(["o[pen]", "e[dit]"],
@@ -1235,7 +1235,7 @@ function Commands() //{{{
             usage: ["wqa[ll]", "xa[ll]"],
             short_help: "Save the session and quit",
             help: "Quit Vimperator, no matter how many tabs/windows are open. The session is stored.<br/>" +
-                  "<code class=\"command\">:wq</code> is different as in vim, as it closes the window instead of just one tab by popular demand. Complain on the mailing list, if you want to change that."
+                  "<code class=\"command\">:wq</code> is different as in Vim, as it closes the window instead of just one tab by popular demand. Complain on the mailing list, if you want to change that."
         }
     ));
     addDefaultCommand(new Command(["zo[om]"],
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index 8863c97a..7631aa19 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -372,7 +372,7 @@ function Mappings() //{{{
         function() { vimperator.commandline.open(":", "buffer ", vimperator.modes.EX); },
         {
             short_help: "Open a prompt to switch buffers",
-            help: "Typing the corresponding number opens switches to this buffer."
+            help: "Typing the corresponding number switches to this buffer."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["B"],
@@ -380,7 +380,7 @@ function Mappings() //{{{
         {
             short_help: "Toggle buffer list",
             help: "Toggles the display of the buffer list which shows all opened tabs.<br/>" +
-                  "Warning: This mapping may be removed/changed in future."
+                  "WARNING: This mapping may be removed/changed in future."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["d"],
@@ -425,7 +425,7 @@ function Mappings() //{{{
             short_help: "Jump to a QuickMark in the current tab",
             usage: ["go{a-zA-Z0-9}"],
             help: "Open any QuickMark in the current tab. You can mark any URLs with <code class=\"mapping\">M{a-zA-Z0-9}</code>. " +
-                  "These QuickMarks are persistent across browser session.",
+                  "These QuickMarks are persistent across browser sessions.",
             flags: Mappings.flags.ARGUMENT
         }
     ));
@@ -697,7 +697,7 @@ function Mappings() //{{{
         function() { vimperator.buffer.scrollStart(); },
         {
             short_help: "Scroll to the absolute left of the document",
-            help: "Unlike in vim, <code class=\"mapping\">0</code> and <code class=\"mapping\">^</code> work exactly the same way."
+            help: "Unlike in Vim, <code class=\"mapping\">0</code> and <code class=\"mapping\">^</code> work exactly the same way."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["$"],