diff --git a/TODO b/TODO
index eac7644f..0b1787c3 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,6 @@ Priority list:
 1-9 as in vim (9=required for next release, 5=would be nice, 1=probably not)
 
 BUGS:
-- autoupdate does not work
 - multiple windows do not work at all, so :q will close the whole browser session, even when there are other windows which has tabs
 - http://en.wikipedia.org/wiki/Portal:Current_events - 'f' shows more hints than 'F' (on left side of nav bar)
 - dpb| 09:09:56  dpb :: when I save a page with vimperator, it adds <hints
@@ -14,14 +13,13 @@ BUGS:
 - can't reverse tab through the vimperator toolbar
 - gu and gU don't work on local files properly
 - :noremap does not work fully
-- n and N are broken with /
 - pvh option not working
+- searching backwards incrementally does not work i.e. with 'incsearch' set
 
 FEATURES:
 9 :command for new commands
 9 :sidebar {addons/bookmarks/history/downloads/...} command with tab completion
   (and automatically getting possible sidebar elements from View->sidebar
-9 Use our own find-as-you-type mechanism (like conkeror does)
 9 make hints smarter, not only with characters from from hintchars, but use "NE" or "NP" for 'new posts' e.g. (might be too slow)
 8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
 8 it would be nice to have :(undo|back|forward) <url> w/ tab completion support
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index 8000661b..40fdf6da 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -955,7 +955,8 @@ function Mappings() //{{{
             usage: ["?{pattern}[?]<CR>"],
             help: "Search backward for the first occurance of <code class=\"argument\">{pattern}</code>.<br/>" +
                   "When '\\c' appears anywhere in the pattern the whole pattern is handled as though <code class=\"option\">'ignorecase'</code> is on. " +
-                  "'\\C' forces case-sensitive matching for the whole pattern."
+                  "'\\C' forces case-sensitive matching for the whole pattern.<br/>" +
+                  "NOTE: incremental searching currenly only works in the forward direction."
         }
     ));
     addDefaultMap(new Map(vimperator.modes.NORMAL, ["n"],
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index 5b780928..f52b370e 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -441,6 +441,7 @@ function Options() //{{{
     addOption(new Option(["incsearch", "is"], "boolean",
         {
             short_help: "Show where the search pattern matches as it is typed",
+            help: "NOTE: Incremental searching currently only works in the forward direction.",
             default_value: true
         }
     ));