Updated some items in the TODO list.