Added my comments on the TODOs

Also fixed some of the TODOs