diff --git a/TODO b/TODO
index 64cac53f..9a2d65f3 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,9 @@
 
-- Contributing guidelines
-- cluster tests for travis-ci
+- [DONE] Contributing guidelines
+- [DONE] cluster tests for travis-ci
 
-- [IN PROGRESS] clustering/routing
-  - Allow implicit route information to propogate to clients?
+- [DONE] clustering/routing
+  - [DONE] Allow implicit route information to propagate to clients?
   - [DONE] Check with EM 1.0 not working
   - [DONE] Client ping timers
   - [DONE] Retry timers on routes
@@ -13,12 +13,11 @@
 - allow port to also be listen_port in config file
 - queue groups allow selection, e.g. round robin vs random?
 - Logger rotation should work
-- Allow clients to specify app/client name
 
-- [IN PROGRESS] tests!
-- [IN PROGRESS] JRuby support - works if you hand run servers for tests
-
-- Add a disconnect cb
+- [DONE] Allow clients to specify app/client name
+- [DONE] tests!
+- [DONE] JRuby support - works if you hand run servers for tests
+- [DONE] Add a disconnect cb
 - [DONE] balance receive perf with send perf (EM issue, iovec)
 - [DONE] Time interval Pings from server..
 - [DONE] Ping/Pong time window