Added a few more items to the TODO list I forgot.