diff --git a/common/content/buffer.js b/common/content/buffer.js
index 19d69cc4..0bda7658 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1931,7 +1931,7 @@ function Marks() //{{{
             }
 
             if (!ok)
-                liberator.echoerr("E20: Mark not set"); // FIXME: move up?
+                liberator.echoerr("E20: Mark not set");
         },
 
         /**
diff --git a/common/content/finder.js b/common/content/finder.js
index 765dc170..9c8e5560 100644
--- a/common/content/finder.js
+++ b/common/content/finder.js
@@ -30,7 +30,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
 // TODO: proper backwards search - implement our own component?
 //     : implement our own highlighter?
-//     : frameset pages
 //     : <ESC> should cancel search highlighting in 'incsearch' mode and jump
 //       back to the presearch page location - can probably use the same
 //       solution as marks
@@ -48,8 +47,6 @@ function Finder() //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    // FIXME:
-    //var self = this;               // needed for callbacks since "this" is the "liberator" object in a callback
     var found = false;               // true if the last search was successful
     var backwards = false;           // currently searching backwards
     var searchString = "";           // current search string (without modifiers)
diff --git a/common/content/io.js b/common/content/io.js
index a3f3a248..0b850bfe 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -878,7 +878,6 @@ lookup:
             let dirs = getPathsFromPathList(options["runtimepath"]);
             let found = false;
 
-            // FIXME: should use original arg string
             liberator.echomsg("Searching for \"" + paths.join(" ") + "\" in \"" + options["runtimepath"] + "\"", 2);
 
             outer:
@@ -902,7 +901,7 @@ lookup:
             }
 
             if (!found)
-                liberator.echomsg("not found in 'runtimepath': \"" + paths.join(" ") + "\"", 1); // FIXME: should use original arg string
+                liberator.echomsg("not found in 'runtimepath': \"" + paths.join(" ") + "\"", 1);
 
             return found;
         },
@@ -1001,7 +1000,7 @@ lookup:
                             {
                                 let lineNumber = i + 1;
 
-                                // FIXME: messages need to be able to specify
+                                // TODO: messages need to be able to specify
                                 // whether they can be cleared/overwritten or
                                 // should be appended to and the MOW opened
                                 liberator.echoerr("Error detected while processing " + file.path, commandline.FORCE_MULTILINE);
diff --git a/common/content/liberator.js b/common/content/liberator.js
index 8894cf3a..0b1cf852 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1069,7 +1069,7 @@ const liberator = (function () //{{{
          * Opens one or more URLs. Returns true when load was initiated, or
          * false on error.
          *
-         * @param {FIXME} urls Either a URL string or an array of URLs.
+         * @param {string|string[]} urls Either a URL string or an array of URLs.
          *     The array can look like this:
          *       ["url1", "url2", "url3", ...]
          *     or:
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 61c96ced..dcf3c94e 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -401,7 +401,7 @@ function Tabs() //{{{
             if (arg)
             {
                 if (/^\d+$/.test(arg))
-                    tabs.select("-" + arg, true); // FIXME: urgh!
+                    tabs.select("-" + arg, true);
                 else
                     liberator.echoerr("E488: Trailing characters");
             }
@@ -989,7 +989,7 @@ function Tabs() //{{{
             // FIXME:
             if (index == -1)
             {
-                liberator.beep(); // XXX: move to ex-handling?
+                liberator.beep();
                 return;
             }
             getBrowser().mTabContainer.selectedIndex = index;