diff --git a/TODO.md b/TODO.md
index ef1a456..f944430 100644
--- a/TODO.md
+++ b/TODO.md
@@ -40,8 +40,8 @@ Key:
 "MOD":      Viewable when logged in with sufficient permissions
 ```
 
-> NOTE: There was no user in the original Indymedia, but there will be in this version.
-> (Saunders) Meaning users who are or are not involved with the output of a given instance?
+> Q. (Saunders): Users being those who _are_, or _are not_ involved with the output of a given instance?
+>     i.e. would they actively be publishing content on the instance, or something else?
 
 ### Behaviour
 
@@ -53,22 +53,22 @@ Key:
       the only thing that would not flow is the mod (not trusted) items.
     - _Emissary Template; based on 'inbox' ?_
     - PUBLIC:
-        - (syn. Newswire from Indymedia)
+        - (syn. Newswire)
         - View
-            - [ ] Curated (syn. Moderated for Indymedia)
+            - [ ] Curated (syn. Moderated)
             - [ ] Most recent N items
             - [ ] Dynamic load earlier items on request (e.g. scroll)
     - MOD:
-        - (syn. Mod Flow from Indymedia)
+        - (syn. Mod Flow)
         - Flagged items could end up here?
         - View
-            - [ ] Uncurated (syn. Unmoderated from Indymedia ?)
+            - [ ] Uncurated (syn. Unmoderated)
             - (See PUBLIC)
         - Edit: Mark item(s) as "public"/"private"
             - Filters (hash tags, users, whole instances, ...)
             - Individual items/objects
 - [ ] 'Stories'
-    - (syn. Features from Indymedia)
+    - (syn. Features)
     - _Emissary Template(s)_
         - based on ?
     - PUBLIC: