Reviewed code, added/removed some TODOs