diff --git a/NEWS b/NEWS
index a9e9f3fb..eb374161 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,10 @@
 <pre>
 2007-XX-XX:
 	* version 0.5.2
-	* added "s" and "a" mappings to extended hints mode for saving hint
-	  targets
-	* "d", "D" and :bdelete support count now 
+	* changed semantics of :set[!] and :prefs[!] a little, :set shows now all non-default
+	  options, use :prefs! to get the about:config window
+	* added "s" and "a" mappings to extended hints mode for saving hint targets
+	* "d", "D" and :bdelete support count now
 	* :back/:forward can use tabcompletion
 	* :undoall support, and tabcompletion for :undo <tab>
 	* new :redraw and Ctrl-L commands for forced redrawing of the screen
@@ -35,6 +36,7 @@
 	* added a visual bell and replaced 'beep' with 'visualbell'
 	* added vimperator logo (can be seen in the addons manager)
 	* added 'hlsearch','incsearch', 'ignorecase' and 'smartcase' options
+	* many small bug fixes and enhancments
 
 2007-09-03:
 	* version 0.5.1
diff --git a/TODO b/TODO
index 8f0a7b27..30e9643b 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,15 @@ 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 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 add an interface for navigating document relationships
 8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
+7 use ctrl-n/p in insert mode for word completion
 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()
 6 downloading of links to filesystem (:save <filename>)
@@ -31,7 +31,6 @@ FEATURES:
 6 pipe selected text/link/website to an external command
 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)
 6 page info support (ctrl-g, g<C-g>)
 5 Use arrow keys in preview window, and ctrl-w+j/k to switch to from preview window
 5 Sort :open completion by date? (use 'wildsort')
@@ -40,7 +39,7 @@ FEATURES:
 4 Support multiple top-level windows?
 3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
   have a look into the split browser extension
-3 :set should also set about:config options (with autocomplete)
+3 :set! should also set about:config options (with autocomplete)
 - many other ideas are listed in the wiki
 
 RANDOM IDEAS: