code review + TODOs