diff --git a/TODO b/TODO
index f7de0d33..0951dd0e 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,16 @@
-Short-term refactoring:
+Refactoring:
     - SSUSession:637, SSUSession:635 get rid of casting to SSUHeader
     - Identity.cpp:156 check for self asignment
-
-Long-term refactoring:
     - Rely on a library for TLS and SSL.
     - Move parsing code out of networking code, to allow better testing. 
+    - Move streaming code to a separate directory.
     - Separate front-end code (SAM, BOB, ...) from the back-end.
 
-
 Additions:
     - Write tests.
     - Add documentation.
+    - Create a specialized IRC tunnel (instead of just a generic ClientTunnel instance).
+    - Ban peers with unexpected / bad behaviour.
+    - EdDSA support.
+    - Return correct error codes in HTTPProxy.
+    - Modify web interface layout and use AJAX to update information.