Updated the TODO list a little.