Some updates to TODO list.