add new stuff to TODO related to last code review