code review - added 3 fixme