diff --git a/AUTHORS b/AUTHORS
index c61e8da0..c58ac533 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@ Developers:
 Patches:
   * Muthu Kannan (ctrl-v support)
   * Lars Kindler (:buffer(s) functionality)
-  * Lee Hinman (:cd command) -> not yet commited
+  * Lee Hinman (:open ./.. support)
   * Bart Trojanowski (Makefile)
+  * Doug Kearns (vimperator.vim)
 </pre>
diff --git a/ChangeLog b/ChangeLog
index 1e2817ee..230654c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 <pre>
 2007-05-02:
 	* version ???
+	* added vimparator.vim for .vimperatorrc syntax highlighting in the XPI (by Doug Kearns)
 	* Added keyword support for bookmarks to the :[tab]open commands
 	* many small bug fixes
 
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index c2bb16eb..7e6b08ff 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -134,7 +134,7 @@ var g_commands = [/*{{{*/
         ["downloads", "dl"],
         ["downloads"],
         "Show progress of current downloads",
-        "Open the original Firefox download dialog in a new tab.",
+        "Open the original Firefox download dialog in a new tab.<br>"+
         "Here, downloads can be paused, canceled and resumed.",
         function() { openURLsInNewTab("chrome://mozapps/content/downloads/downloads.xul", true); },
         null
diff --git a/chrome/content/vimperator/completion.js b/chrome/content/vimperator/completion.js
index f03e48f8..638f332a 100644
--- a/chrome/content/vimperator/completion.js
+++ b/chrome/content/vimperator/completion.js
@@ -409,6 +409,8 @@ function get_search_completions(filter)/*{{{*/
 function get_history_completions(filter)/*{{{*/
 {
     var history = document.getElementById("hiddenHistoryTree");
+    if (!history)
+        return [];
 
     // build our history cache
     if (history_loaded == false)