diff --git a/TODO b/TODO
index f35f9b0de..c12799693 100644
--- a/TODO
+++ b/TODO
@@ -2,8 +2,10 @@
 - Roster manipulation support
 - On-the-fly code updates
 - S2S \o/
+- Control/statistics interface
 
 Further down the line:
+- Ad-hoc commands
 - Clustering
 - Pubsub/PEP
 - Plugins!
diff --git a/doc/names.txt b/doc/names.txt
new file mode 100644
index 000000000..ced293bbe
--- /dev/null
+++ b/doc/names.txt
@@ -0,0 +1,9 @@
+lxmppd	 -	...
+dia	 -	Greek, 'through', pronounced "dee-ah", root of "dialogue"
+metaphor -  	An imaginative comparison between two actions/objects etc which is not literally applicable.
+minstrel -  	Itinerant medieval musician/singer/story teller/poet. 
+parody	 -	Imitation of a poem or another poet's style for comic/satiric effect.
+poesy	 -	Archaic word for poetry.
+Xinshi   -	Chinese poetic term which literally means 'new poetry'.
+
+polylogue-	Many conversations
diff --git a/doc/stanza_routing.txt b/doc/stanza_routing.txt
index a14945534..4befeb0e7 100644
--- a/doc/stanza_routing.txt
+++ b/doc/stanza_routing.txt
@@ -27,3 +27,4 @@ To local contact:
 To remote contact:
 	Initiate s2s connection if necessary
 	Send stanza across
+