diff --git a/TODO.txt b/TODO.txt
index 520526d..fb80dee 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,14 +2,17 @@
 PRE-RELEASE
 ===========
 
-- hexchat: missing nick list
---- works if we reply NAMES to WHO queries, but that throws andchat
---- support WHOX just for hexchat??
+- yaaic: doesn't recognise the room join (even with autojoin disabled)
 
-- yaaic/atomic: doesn't recognise the room join (even with autojoin disabled)
+- atomic: crashes
 
-- andchat: WHO list doesn't get /cleared/ on room quit+autojoin
+- andchat: userlist doesn't get cleared whenever we send an updated NAMES list (e.g. on room quit+autojoin, or on MODE (hexchat hack))
+	- https://github.com/znc/znc/issues/424
 
+- androirc: everything's fine
+
+- hexchat: everything's fine
+	
 - part all nicks upon upstream server disconnection
 
 - test the current password auth
@@ -32,7 +35,7 @@ WISHLIST
 
 - expose upstream op status
 
-- support WHO
+- support WHOX
 
 - support WHOIS
 
@@ -40,13 +43,11 @@ WISHLIST
 
 - use CTCP chat to support irc-special characters in chat messages (colon, newline)
 
-- respond to CAP LS 302 (hexchat) in some way that'll kick us into a modern protocol mode
-
 - support SASL PLAIN authentication as well as just classic PASS
 
 - threadsafe access to libnmdc hub options
 
-- do we need to send the same payload in our PONG response?
+- remove color code escape sequences