More reformatting of the TODO list.