diff --git a/TODO b/TODO
@@ -8,32 +8,18 @@
 
 4: Move everything to a config file?
 
-5: Ability to toggle PM commands on/off?
+5: Add showing when you cannot join a channel because lolbanned
 
-6: Add showing when you cannot join a channel because lolbanned
-
-7: Investigate why I cant add a : when using $raw privmsg
+6: Investigate why I cant add a : when using $raw privmsg
 	- String parsing " : " when adding quotes. everything past that isnt added.
 
-8: Find a way to make plugins hook themselves. they would have to init when imported, but that means they would probably have to import Commands, Make them add to the cmds dict.
+7: Find a way to make plugins hook themselves. they would have to init when imported, but that means they would probably have to import Commands, Make them add to the cmds dict.
 	try/except to pass plugins like MpdScript that require another module
 	a blank dictionary/list/something that holds the names of all the loaded modules
 
-9: Allow non-commandvar commands.
-
-10: Dont import plugins that require modules that are not installed.
+8: Dont import plugins that require modules that are not installed.
 	- Mainly mpdscript.py
 
->>> next(m)
-* [AutoMeme] Getting moar memes!
-* [AutoMeme] Error requesting new memes.
-Traceback (most recent call last):
-  File "<input>", line 1, in <module>
-  File "Plugins/Meme.py", line 26, in meme
-    meme_db = get_meme()
-  File "Plugins/Meme.py", line 15, in get_meme
-    for meme in memes:
-UnboundLocalError: local variable 'memes' referenced before assignment
 
 #### PLUGINS ####
 
@@ -43,24 +29,18 @@ UnboundLocalError: local variable 'memes' referenced before assignment
 2: FuckMyLife
 	- Name says it all.
 
-3: IRCLaws
-
-4: DuckDuckGo
+3: DuckDuckGo
 
-5: Services
+4: Services
 	- Nickserv
 	- Any other service that might be wanted
 	- Kick, Ban, Unban, Kban, etc. (Need to update blackbox for this)
 
-6: Guess
+5: Guess
 
-7: Slap
+6: Slap
 	- Now that i have a working dict that holds users of a channel ;D
-
-8: 4chon
-	- On 4chon link:
-		-  Posters_Name (Post_Count, Image_Count) posted: OPs_Text - Link to thread (If mod.php?/ remove it)
-
+7: http://www.insultgenerator.org/
 ###
 def hook(obj=None):
 	if not obj:
@@ -69,8 +49,13 @@ def hook(obj=None):
 		obj.cmds[commandname] = [function/object, level, hostcheck]
 		#Repeat as needed for every part.	
 ###
-
-Plugins and Commands from the original WhergBot:
-(Misc.py ?)
-Size
-
+>>> next(m)
+* [AutoMeme] Getting moar memes!
+* [AutoMeme] Error requesting new memes.
+Traceback (most recent call last):
+  File "<input>", line 1, in <module>
+  File "Plugins/Meme.py", line 26, in meme
+    meme_db = get_meme()
+  File "Plugins/Meme.py", line 15, in get_meme
+    for meme in memes:
+UnboundLocalError: local variable 'memes' referenced before assignment
diff --git a/WhergBot.py b/WhergBot.py
@@ -17,8 +17,8 @@
 		WhergBot = Core.Bot(nick, real, ident, owner, ssl)
 		WhergBot.Connect(server='opsimathia.datnode.net', port=port)
 		WhergBot.irc.send("MODE {0} +Bs".format(nick))
-		WhergBot.irc.join("hacking,lobby,4chon,circlejerk,minecraft,tinyboard,tsunagari") #Channels can start with # too.
-		#WhergBot.irc.join("#hacking")
+		WhergBot.irc.join("hacking,lobby,4chon,circlejerk,minecraft,tinyboard,tsunagari,h") #Channels can start with # too.
+		#WhergBot.irc.join("#h")
 		while WhergBot.irc._isConnected:
 			WhergBot.Parse(WhergBot.irc.recv(bufferlen=2048))