Fixed includes. Updated TODOs.