diff --git a/CHANGES.rst b/CHANGES.rst
index 6ff0115..eeae8ed 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,13 +1,14 @@
 0.4
 ---
+- Added support for server-side callbacks thanks to Zac Lee
+- Added low-level _SocketIO to remove cyclic references
 - Merged Channel functionality into BaseNamespace thanks to Alexandre Bourget
-- Added support for unicode thanks to Zac Lee
 
 0.3
 ---
 - Added support for secure connections
 - Added socketIO.wait()
-- Improved exception handling in heartbeatThread and namespaceThread
+- Improved exception handling in _RhythmicThread and _ListenerThread
 
 0.2
 ---
diff --git a/TODO.goals b/TODO.goals
index d76ca64..84b159c 100644
--- a/TODO.goals
+++ b/TODO.goals
@@ -1,12 +1,7 @@
 = Resolve pull requests
-    + Resolve pull request #6
-        + Add unit test for handling server callback
-        + Use json with ensure_ascii=False
-        + Add emit with callback in serve_tests
 Resolve issues
     Investigate issue #8
 Examine forks
-    Integrate Zac's fork #6
     Integrate Sajal's fork #7
     Integrate Francis's fork #10
     Integrate Paul's fork