diff --git a/BUGS b/BUGS
index 094a75a9d..7ad503f9a 100644
--- a/BUGS
+++ b/BUGS
@@ -1,17 +1,6 @@
 Crashes
 =======
 
-- Segfault when opening an SSL page and then switching the tab to a non-SSL
-  page.
-
-  This happens because we don't filter the ssl_errors command correctly per tab
-  and then re-emit it for the wrong tab which doesn't even use SSL.
-
-  Will be fixed by using a QNetworkAccessManager per tab again, which is a good
-  idea (for per-tab-proxy) anyways.
-
-  Workaround in 5a6326922ee770cca721539ad71b048896f7d4af
-
 - When following a hint:
 
   QNetworkReplyImplPrivate::error: Internal problem, this method must only be called once.
@@ -43,11 +32,6 @@ Bugs
 - When opening DDG the input field should be focused when JS is active, but
   only is sometimes. (seir)
 
-- When opening 111.111.111.111 sometimes there's no loading bar and link in
-  statusbar points to the old page. (seir)
-
-- Current URL displayed in the statusbar is weird and sometimes wrong (seir)
-
 - restart sometimes abort()s on QApplication __init__ (V155)
 
 - qutebrowser :restart loops endlessly
@@ -85,13 +69,9 @@ Bugs
 
 - Relative file paths and ~ don't work at all.
 
-- Pasting highlighted text (to mrxvt) does not work (iggy).
-
 - scroll_page doesn't care about always visible bars, so content gets hidden
   e.g. http://www.mtb-news.de/forum/t/welcher-schuh-five-ten-vs-oneal.529148/
 
-- Command history seems to be broken
-
 - Config errors on start shouldn't be hard errors
   (e.g. when an user-stylesheet file is deleted)
 
@@ -136,37 +116,3 @@ Upstream Bugs
 
 - Tabbar texts get cut off when styled and elided
     https://bugreports.qt-project.org/browse/QTBUG-15203
-
-
-Probably fixed crashes
-======================
-
-- Segfault when closing some tab:
-    QIODevice::read: device not open
-    QIODevice::read: device not open
-    QIODevice::read: device not open
-    Fatal Python error: Segmentation fault
-
-    Current thread 0x00007ff4ed080700 (most recent call first):
-      File "/home/florian/proj/qutebrowser/git/qutebrowser/__main__.py", line 29 in main
-      File "/home/florian/proj/qutebrowser/git/qutebrowser/__main__.py", line 33 in <module>
-      File "/usr/lib/python3.4/runpy.py", line 86 in _run_code
-      File "/usr/lib/python3.4/runpy.py", line 171 in _run_module_as_main
-
-    @ e5000c315dd29ae9356e1b33ed041917c637c85b
-
-    Probably fixed by de7c6a63b48f66e164bf4baa6e892bcbb326d6b9
-
-- When opening a hint with F:
-
-    2014-05-06 09:01:25 [DEBUG] [_tabbedbrowser:tabopen:153] Opening PyQt5.QtCore.QUrl('http://ddg.gg/')
-    Traceback (most recent call last):
-      File ".\qutebrowser\widgets\_tabbedbrowser.py", line 155, in tabopen
-        tab = WebView(self)
-      File ".\qutebrowser\widgets\webview.py", line 83, in __init__
-        self.page_ = BrowserPage(self)
-      File ".\qutebrowser\browser\webpage.py", line 44, in __init__
-        self.setNetworkAccessManager(QApplication.instance().networkmanager)
-    RuntimeError: wrapped C/C++ object of type NetworkManager has been deleted
-
-    Probably fixed by de7c6a63b48f66e164bf4baa6e892bcbb326d6b9
diff --git a/TODO b/TODO
index e1bd05a34..808384bd8 100644
--- a/TODO
+++ b/TODO
@@ -12,13 +12,10 @@ Before 0.1
 - Save tabs feature
 - More dwb keybindings
 - Use  :open engine searchterm   syntax for searching
-- Basic SSL handling
-    e.g. broken on https://fsinf.fh-worms.de/
-    at least ssl-strict setting and default certs
-    SSL-symbol in statusbar
-- Authentification (for websites/proxy)
-   - prompt in statusbar
-   - ssl-strict=ask
+- SSL handling
+    - do we have default certs?
+    - ssl-strict=ask
+    - SSL-symbol in statusbar?
 - Downloads (at least calling a handler)
 
 Style
@@ -44,8 +41,7 @@ New big features
 - Bookmarks
 - Internationalization
 - more completions (URLs, ...)
-- SSL handling
-- history
+- proper webpage history
 
 Improvements / minor features
 =============================
@@ -87,10 +83,10 @@ Improvements / minor features
          elem = frame.findFirstElement('*:focus')
 - somehow unfocus elements (hide blinking cursor) when insert mode is left?
 - tabs: some more padding?
-- Really fix URL detection properly
 - Make it possible to open inspector in a new window.
 - Copy link location on crash mail should not copy mailto:
 - Drag&Drop of tabs to other windows
+- Use QNetworkAccessManager per QWebPage again so we can set proxy per tab.
 
 hints
 -----
@@ -102,14 +98,6 @@ hints
 - uppercase hint chars without requiring upper case to type (easier to
   distinguish)
 
-Useful things
-=============
-
-http://www.tenox.net/out/wrp11-qt.py
-https://code.google.com/p/webscraping/source/browse/webkit.py
-https://github.com/jeanphix/Ghost.py/blob/master/ghost/ghost.py
-http://otter-browser.org/
-
 dwb keybindings to possibly implement
 =====================================