diff --git a/TODO.md b/TODO.md
index 6659138..9f42c89 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,12 @@
 # TODO
 
 ## aquatic
-* Lock connections and torrents together? Maybe don't stop collecting
-  requests if mutex is locked?
+* Use hashbrown HashMap for faster hasher (or try SeaHash?)
+* Put connections and torrent in a struct behind a commong lock. Add
+  functionality for checking if mutex is unlocked before quitting to
+  collect requests from channel (try_recv) up to a limit.
+* Add config variable like "handler_max_requests" (default 1024?)
+* Shorter timeout on handler channel collector (1ms?)
 * Handle Ipv4 and Ipv6 peers. Probably split state. Ipv4 peers can't make
   use of Ipv6 ones. Ipv6 ones may or may note be able to make use of Ipv4
   ones, have to check.