diff --git a/common/content/buffer.js b/common/content/buffer.js
index caa4000a..aff55af2 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -32,7 +32,7 @@ const Point = new Struct("x", "y");
 
 /**
  * A class to manage the primary web content buffer. The name comes
- * from vim's term, 'buffer', which signifies instances of open
+ * from Vim's term, 'buffer', which signifies instances of open
  * files.
  * @instance buffer
  */
@@ -1428,8 +1428,8 @@ function Marks() //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    var localMarks = storage.newMap('local-marks', true);
-    var urlMarks = storage.newMap('url-marks', true);
+    var localMarks = storage.newMap("local-marks", true);
+    var urlMarks = storage.newMap("url-marks", true);
 
     var pendingJumps = [];
     var appContent = document.getElementById("appcontent");
diff --git a/common/content/completion.js b/common/content/completion.js
index fd465199..63e803aa 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1338,6 +1338,7 @@ function Completion() //{{{
             context.completions = config.autocommands;
         },
 
+        // TODO: shouldn't these app-specific completers be moved to config.js? --djk
         bookmark: function bookmark(context, tags, extra)
         {
             context.title = ["Bookmark", "Title"];
diff --git a/common/content/eval.js b/common/content/eval.js
index daf0dba6..ff7310e2 100644
--- a/common/content/eval.js
+++ b/common/content/eval.js
@@ -4,7 +4,7 @@ catch (e)
 {
     __liberator_eval_error = e;
 }
-// Important: The eval statement *must* remain on the first line
+// IMPORTANT: The eval statement *must* remain on the first line
 // in order for line numbering in any errors to remain correct.
 //
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/events.js b/common/content/events.js
index a490381b..a7c427e3 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -805,7 +805,7 @@ function Events() //{{{
             {
                 if (lastMacro.length == 1)
                     // TODO: ignore this like Vim?
-                    liberator.echoerr("Exxx: Register " + lastMacro + " not set");
+                    liberator.echoerr("Exxx: Register '" + lastMacro + "' not set");
                 else
                     liberator.echoerr("Exxx: Named macro '" + lastMacro + "' not set");
             }
diff --git a/common/content/help.js b/common/content/help.js
index c2ee6b87..12a639a8 100644
--- a/common/content/help.js
+++ b/common/content/help.js
@@ -9,3 +9,4 @@ let url = page ? "chrome://liberator/locale/" + page : content.history.previous;
 
 win.getBrowser().loadURIWithFlags(url, Components.interfaces.nsIWebNavigation.LOAD_FLAGS_REPLACE_HISTORY, null, null, null);
 
+// vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/liberator.js b/common/content/liberator.js
index 62f150f9..a1bb47f1 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1113,6 +1113,7 @@ const liberator = (function () //{{{
                         break;
 
                     default:
+                        // FIXME: should this really be a user-visible error? --djk
                         liberator.echoerr("Exxx: Invalid 'where' directive in liberator.open(...)");
                         return false;
                 }
diff --git a/vimperator/locale/en-US/help.js b/vimperator/locale/en-US/help.js
index 00889f12..8661e34b 100644
--- a/vimperator/locale/en-US/help.js
+++ b/vimperator/locale/en-US/help.js
@@ -25,3 +25,4 @@ document.addEventListener("click", function (event) {
         elem.href = "chrome://liberator/content/help.xul?" + encodeURIComponent(tag);
 }, true);
 
+// vim: set fdm=marker sw=4 ts=4 et: