diff --git a/TODO b/TODO
index 114c2419..e9c3ea03 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:
-- switching tabs while HINT_MODE_ALWAYS is on does not redisplay hints in new tabs, but exits hint mode
 - 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)
@@ -14,15 +13,19 @@ BUGS:
 - add window resize support to hints
 - can't reverse tab through the vimperator toolbar
 - 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 /
+- pvh option not working
 
 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 Use our own find-as-you-type mechanism (like conkeror does)
-8 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 it would be nice to have :(undo|back|forward) <url> w/ tab completion support
+8 :set invoption/option! to toggle a bool option
 7 [ctrl-o/i] to Go back to a Previous Position (done partly, however currenty does not use a per tab jumplist)
 7 whereever possible: get rid of dialogs and ask console-like dialog questions or write error prompts directly on the webpage or with :echo()
 7 3d should delete 3 tabs
@@ -31,7 +34,6 @@ FEATURES:
 6 vim like mappings for caret mode and textboxes (i to start caret mode?)
   http://nigel.mcnie.name/gnawt/ has a somewhat working implementation
 6 pipe selected text/link/website to an external command
-6 it would be nice to have :(undo|back|forward) <url> w/ tab completion support
 6 macros (qq)
 6 gf = view source?
 6 make a real one-tab-mode, divert _all_ other targets, possible by setting a firefox option (set popup=0-3)