diff --git a/BUGS b/BUGS
index 5cdd9ec42..1ef0e4063 100644
--- a/BUGS
+++ b/BUGS
@@ -1,29 +1,14 @@
-Crashes
-=======
+Bugs
+====
 
 - When following a hint:
 
   QNetworkReplyImplPrivate::error: Internal problem, this method must only be called once.
 
-- When enabling javascript on http://google.com/accounts and reloading:
-
-    OpenType support missing for script 12
-
-  Then it quits.
-  When javascript is enabled already, hangs.
-  With minimal browser, prints error but continues to run.
-
-  Also quits on http://de.wikipedia.org/wiki/Hallo-Welt-Programm
-
-  It seems this only happens on Windows.
-
 - Closing some tabs and undo all them -> quits and CMD.exe hangs
 
     QHttpNetworkConnectionPrivate::_q_hostLookupFinished could not dequeu request
 
-Bugs
-====
-
 - All kind of FIXMEs
 
 - When opening DDG the input field should be focused when JS is active, but
diff --git a/TODO b/TODO
index 96dc0a4b6..d22f8ac44 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,10 @@
 Before 0.1
 ==========
 
-- Check FIXMEs
+- Check BUGS
 - Manpage
 - Website
 - Tests for URL detection and fix corner cases
-- Fix some crashes + bugs if we can
-- Fix shutdown
 - Maybe test under other platforms
 - Autosave feature (against segfaults/...)
 - Save tabs feature
@@ -16,6 +14,7 @@ Before 0.1
     - ssl-strict=ask
     - SSL-symbol in statusbar?
 - Downloads (at least calling a handler)
+- How long should javascript statusbar messages be displayed?!
 
 Style
 =====
@@ -50,6 +49,7 @@ Improvements / minor features
     http://qt-project.org/doc/qt-4.8/qnetworkcookie.html
     - Second column (flag): TRUE if domain starts with ., else FALSE
     - if a cookie is a http-only cookie domain is prepended with a #HttpOnly_
+    - Python's http.cookiejar.MozillaCookieJar might help
 - Zoom with ctrl + mousewheel
 - search highlighting
 - vertical tabbar
@@ -76,7 +76,6 @@ Improvements / minor features
 - Use QNetworkAccessManager per QWebPage again so we can set proxy per tab.
 - Multi-line statusbar or own widget for long messages?
 - :messages command to view past messages
-- How long should javascript statusbar messages be displayed?!
 
 hints
 -----