ToDo edit

Lots of additions and edits