Reviewed code, added/removed TODOs