Reviewed code, added/removed some TODOs

WRT the previous commit, all other classes have been reviewed