cleanup comments and leave notes for parts left todo