update TODO with some more ideas