update TODO with more ideas, group items