minor rearrangements of the ToDos. I really should set up the wiki for this