diff --git a/TODO.md b/TODO.md
index 498ced1..c4cf0fc 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,10 +4,14 @@
   * cpu pinning - also rename config
   * access lists
   * privdrop
-  * scrape requests
   * clean out connections regularly
     * timeout inside of task for "it took to long to receive request, send response"?
     * remove finished tasks from slab
+  * test with load tester with multiple workers
+  * consider better error type for request parsing, so that better error
+    messages can be sent back (e.g., "full scrapes are not supported")
+  * Scrape: should stats with only zeroes be sent back for non-registered info hashes?
+    Relevant for mio implementation too.
   * Don't return read request immediately. Set it as self.read_request
     and continue looping to wait for any new input. Then check after
     read_tls is finished. This might prevent issues when using plain HTTP
@@ -15,7 +19,6 @@
     is stopped, which might lead to various issues.
 
 * aquatic_udp glommio
-  * Check that it is the response consumer id responses are sent back to
   * Add to file transfer CI
   * consider adding ConnectedScrapeRequest::Scrape(PendingScrapeRequest)
     containing TransactionId and BTreeMap<usize, InfoHash>, and same for