diff --git a/Makefile b/Makefile
index 81d648c7..133086cd 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ JAR_FILES     = ${shell find chrome/content -type f 		\
 JAR_DIRS      = $(foreach f,${JAR_FILES},$(dir $f))
 JAR           = chrome/vimperator.jar
 
-XPI_TXT_FILES = install.rdf chrome.manifest TODO AUTHORS Donators ChangeLog
+XPI_TXT_FILES = install.rdf chrome.manifest TODO AUTHORS Donators NEWS
 XPI_DIRS      = $(foreach f,${XPI_FILES},$(dir $f))
 XPI_BIN_FILES = ${JAR} Makefile
 XPI_FILES     = ${XPI_BIN_FILES} ${XPI_TXT_FILES}
diff --git a/TODO b/TODO
index c434dfbb..114c2419 100644
--- a/TODO
+++ b/TODO
@@ -13,9 +13,10 @@ BUGS:
      webpage, saving  only the html works just fine..
 - add window resize support to hints
 - can't reverse tab through the vimperator toolbar
-- gu doesn't work when the current URL contains a trailing slash
 - gu and gU don't work on local files properly
 - http://www.suckless.org/pipermail/dwm/2007-July/003075.html
+- :noremap does not work fully
+- n and N are broken with /
 
 FEATURES:
 9 :command for new commands
@@ -51,8 +52,8 @@ RANDOM IDEAS:
 * Would it be possible to add a setting "maxcompletionsshown" and 
   "maxpreviewwindowheight" or something like this?
 * 16:06:04       bartman| maxauthority: feature idea: what if :n and :N searched the 
-                        page and if they found a unique <a href=...>.*next.*</a> or <a 
-                        href=...>.*prev.*<a/> they would follow that link?
+                        page and if they found a unique href=*next.* or 
+                        href=.*prev.* they would follow that link?
 * hide scrollbars: http://rafb.net/p/YHRhEe47.html (window.content.document.body.style.overflow = "hidden")
 
 </pre>
diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js
index 9241d4af..b969e694 100644
--- a/chrome/content/vimperator/help.js
+++ b/chrome/content/vimperator/help.js
@@ -145,7 +145,7 @@ vimperator.help = function(section, easter) //{{{
         'It has similar key bindings, and you could call it a modal web browser, as key bindings differ according to which mode you are in.</p>\n' +
 
         '<p><span class="warning">Warning:</span> To provide the most authentic Vim experience, the Firefox menubar and toolbar were hidden.<br/>' +
-        'If you really need them, type: <code class="command">:set guioptions=mT</code> to get it back.\n' +
+        'If you really need them, type: <code class="command">:set guioptions+=mT</code> to get it back.\n' +
         'If you don\'t like Vimperator at all, you can uninstall it by typing <code class="command">:addons</code> and remove/disable it. ' +
         'If you like it, but can\'t remember the shortcuts, press <code class="mapping">F1</code> or <code class="command">:help</code> to get this help window back.</p>\n' +