diff --git a/BUGS b/BUGS
index 9b243e1d9..f1355cfc1 100644
--- a/BUGS
+++ b/BUGS
@@ -59,6 +59,9 @@ Bugs
   window has a bigger size hint instead of tabs getting smaller than the
   minimum size (iggy)
 
+- Directly opening a webm video (e.g.
+  http://fat.gfycat.com/AlienatedMaleAplomadofalcon.webm ) prints a webkit error.
+
 Upstream Bugs
 =============
 
diff --git a/TODO b/TODO
index 493a674f4..433d8a471 100644
--- a/TODO
+++ b/TODO
@@ -42,6 +42,7 @@ New big features
 Improvements / minor features
 =============================
 
+- Improve error pages (print error domain/code/...)
 - Print nicer error message when platform plugin is missing
   (on Arch: libxkbcommon-x11)
 - Add harfbuzz forcing to version info
@@ -87,6 +88,11 @@ hints
 - uppercase hint chars without requiring upper case to type (easier to
   distinguish)
 
+Style
+=====
+
+- Use context managers (e.g. editor/hintmanager/...)
+
 dwb keybindings to possibly implement
 =====================================
 
diff --git a/notes b/notes
index 94251b07c..25ea8c23e 100644
--- a/notes
+++ b/notes
@@ -1,3 +1,9 @@
+click inspirations
+===================
+
+- Editor: https://github.com/mitsuhiko/click/blob/master/click/_termui_impl.py#L311
+- Types: https://github.com/mitsuhiko/click/blob/master/click/types.py
+
 Multiwindow
 ===========