diff --git a/ChangeLog b/ChangeLog
index 21851056..b679f770 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
 <pre>
-date:
+2007-05-01:
 	* version 0.4
 	* extension GUID was changed to 'vimperator@mozdev.net' -> YOU WILL HAVE
 	  TO UNINSTALL ANY OLD VIMPERATOR INSTALLATION BEFORE INSTALLING THIS VERSION
-	* support for internal search engines was dropped. Now we use Firefox
-	  search engines. Add custom search engines with :qsadd, remove engines with :qsdel
+	* support for internal search engines was dropped. Now we use Firefox search engines
 	* support for 'wildmode' completion setting with support for matching the
 	  longest common substring. Also new 'wildoptions' setting
 	* added 'f' to the 'complete' option to allow listing of filenames in :open prompt
diff --git a/TODO b/TODO
index da898a3f..771fc497 100644
--- a/TODO
+++ b/TODO
@@ -10,13 +10,13 @@ BUGS:
 - multiple windows to not work at all, so :q will close the whole browser session, even when there are other windows which has tabs
 - reload/stop buttons don't update enabled state
 - http://en.wikipedia.org/wiki/Portal:Current_events - 'f' shows more hints than 'F' (on left side of nav bar)
+- gu and gU don't work on local files properly
 
 FEATURES:
 9 marks of a Location, [m a-zA-Z] to set it, [` a-zA-Z] to go there
   [m 0-9] marks a buffer instead [' 0-9] goes there
   also mark bookmarks (with M[a-zA-Z] maybe and use only lowercase marks for inbuffer marks?)
   also support :mark and :marks
-8 :open .. -> Up one directory, :cd goes to top location, [Backspace] command shortcut, use count (:3cd goes 3 levels up)
 8 downloading of links to filesystem (:save <filename>)
 8 provide a buffer on the bottom where more than 1 line messages can be shown, preferrable
   with color support (for things like :echo line1\nline2)
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 26635c40..93b7f648 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1339,7 +1339,9 @@ function stringToURLs(str)
          * open it with default search engine */
         if (urls[url].match(/\s+/) || urls[url].match(/\.|:|\//) == null)
         {
-            var default_engine = search_service.defaultEngine;
+            // defaultEngine is always the same (Google), therefor let's use the currentEngine
+            var default_engine = search_service.currentEngine;
+            //var default_engine = search_service.defaultEngine;
             if (default_engine)
             {
                 urls[url] = default_engine.getSubmission(urls[url], null).uri.spec;
diff --git a/install.rdf b/install.rdf
index 63b686af..e03149b2 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,10 +6,10 @@
 	<em:id>vimperator@mozdev.org</em:id>
 	<em:name>Vimperator</em:name>
 	<em:version>###VERSION###</em:version>
-	<em:description>Make Firefox work like Vim</em:description>
+	<em:description>Make Firefox behave like Vim</em:description>
 	<em:creator>Martin Stubenschrott</em:creator>
 	<em:homepageURL>http://vimperator.mozdev.org</em:homepageURL>
-	<em:updateURL>http://downloads.mozdev.org/vimperator/update.rdf</em:updateURL>
+	<!--em:updateURL>http://downloads.mozdev.org/vimperator/update.rdf</em:updateURL-->
 	<em:file>
 	    <Description about="urn:mozilla:extension:file:vimperator.jar">
 		<em:package>content/vimperator/</em:package>
@@ -20,7 +20,7 @@
 	    <Description>
 		<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 		<em:minVersion>2.0</em:minVersion>
-		<em:maxVersion>2.1</em:maxVersion>
+		<em:maxVersion>2.0.0.*</em:maxVersion>
 	    </Description>
 	</em:targetApplication>
     </Description>