Clean up TODO list and add some new items.