diff --git a/content/completion.js b/content/completion.js
index f9a48e98..0cb87308 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -650,30 +650,6 @@ vimperator.Completion = function () //{{{
             {
                 matches = str.match(/^:*\d*\w+!?\s+/);
                 exLength = matches ? matches[0].length : 0;
-
-            //    // TODO: maybe we should move these checks to the complete functions
-            //    if (command.hasName("open") || command.hasName("tabopen") || command.hasName("winopen"))
-            //    {
-            //        var skip = args.match(/^(.*,\s+)(.*)/); // start after the last ", "
-            //        if (skip)
-            //        {
-            //            start += skip[1].length;
-            //            args = skip[2];
-            //        }
-            //    }
-            //    else if (command.hasName("echo") || command.hasName("echoerr") || command.hasName("javascript"))
-            //    {
-            //        var skip = args.match(/^(.*?)(\w*)$/); // start at beginning of the last word
-            //        if (skip)
-            //            start += skip[1].length;
-            //    }
-            //    else if (command.hasName("source"))
-            //    {
-            //        var skip = args.match(/^(.*?)(\w*)$/); // start at beginning of the last word
-            //        if (skip)
-            //            start += skip[1].length;
-            //    }
-
                 [start, completions] = command.completer.call(this, args);
             }
             return [exLength + start, completions];
diff --git a/content/options.js b/content/options.js
index c1852729..809d4eb6 100644
--- a/content/options.js
+++ b/content/options.js
@@ -606,7 +606,7 @@ vimperator.Options = function () //{{{
             shortHelp: "Patterns to use when guessing the 'next' page in a document sequence",
             help: "Each pattern, in order, is matched against all links in the page with the first match being used.<br/>" +
             "The patterns are case insensitive regular expressions.",
-            defaultValue: "\\bnext,^>$,^>>$"
+            defaultValue: "\\bnext,^>$,^>>$,^>,>$"
         }
     ));
     optionManager.add(new vimperator.Option(["pageinfo", "pa"], "charlist",
@@ -663,7 +663,7 @@ vimperator.Options = function () //{{{
             shortHelp: "Patterns to use when guessing the 'previous' page in a document sequence",
             help: "Each pattern, in order, is matched against all links in the page with the first match being used.<br/>" +
             "The patterns are case insensitive regular expressions.",
-            defaultValue: "\\bprev|previous\\b,^<$,^<<$"
+            defaultValue: "\\bprev|previous\\b,^<$,^<<$,^<,<$"
         }
     ));
     optionManager.add(new vimperator.Option(["scroll", "scr"], "number",