diff --git a/content/commands.js b/content/commands.js
index f6ea3fd3..4463d6f4 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -534,9 +534,9 @@ function Commands() //{{{
 
                                 if (complete)
                                 {
-                                    args.completeStart += optname.length + count;
                                     if (quote || !invalid && count)
                                     {
+                                        args.completeStart += optname.length + 1;
                                         args.completeOpt = opt[0][0];
                                         args.quote = quoteArg[quote] || quoteArg[""];
                                         if (typeof opt[3] == "function")
diff --git a/content/completion.js b/content/completion.js
index 5af617e7..823708da 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -1080,12 +1080,12 @@ function Completion() //{{{
                 if (args)
                 {
                     // XXX, XXX, XXX
+                    let argContext = context.fork("args", args.completeStart);
                     compObject = command.completer.call(command, context, args, special, count);
                     if (compObject instanceof Array) // for now at least, let completion functions return arrays instead of objects
                         compObject = { start: compObject[0], items: compObject[1] };
                     if (args.completions)
                     {
-                        let argContext = context.fork("args", args.completionStart);
                         argContext.title = [args.completeOpt || "Options"];
                         argContext.items = args.completions;
                     }
diff --git a/content/options.js b/content/options.js
index a44cc563..17a11846 100644
--- a/content/options.js
+++ b/content/options.js
@@ -688,6 +688,7 @@ function Options() //{{{
             bang: true,
             completer: function (context, args, special, count, modifiers)
             {
+                let filter = context.filter;
                 var optionCompletions = [];
 
                 if (special) // list completions for about:config entries
diff --git a/content/style.js b/content/style.js
index fb08a574..92f4894c 100644
--- a/content/style.js
+++ b/content/style.js
@@ -440,7 +440,7 @@ liberator.registerObserver("load_commands", function ()
                         compl.push([content.location.href, "Current URL"]);
                     }
                     catch (e) {}
-                    comp = compl.concat([[s, ""] for each (s in styles.sites)])
+                    compl = compl.concat([[s, ""] for each (s in styles.sites)])
                     return [0, completion.filter(compl, args.arguments[0])];
                 }
                 return [0, []];
diff --git a/content/ui.js b/content/ui.js
index af2746d5..e42966e9 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -314,7 +314,7 @@ function CommandLine() //{{{
     // TODO: doesn't belong in ui.js
     options.add(["complete", "cpt"],
         "Items which are completed at the :[tab]open prompt",
-        "charlist", "sfbh",
+        "charlist", "sfl",
         {
             completer: function (filter)
             {