TODOs and edits

I'm going to take a shower, I'm kinda smelly.
I've added some todo's to clean up the code in main.