Removed all the //TODO lines that I could

If possible, just merge the commit "Removed 200 or so //TODO lines" by Duncan.