Review 1
Fix some TODOs.