Comments updated
Did ToDos and fixed stuff up

Finished ToDos cleaned up some code and unessisary parts, and fixed some
code up to work properly.
bug introduced with merge fixed