diff --git a/TODO b/TODO
index c1fe87b..475a7d8 100644
--- a/TODO
+++ b/TODO
@@ -1,15 +1,15 @@
 TODO
 ----
 
  - XMPP multi-party Chat
- - XMPP Discovery
+ - XMPP Discovery for chat
+ - Offline storage
  - XMPP Jingle
  - XMPP File Transfer
- - Registrat application
+ - Registrant application to map rooms to public accounts
  - Management interface
  - Re-invite will all media
  - CANCEL server outgoing INVITE
- - Automatic Call Transfer on topology change
  - Add participants using resource-list
  - Integrate mobwrite or etherpad collboration editor