Took some things off the TODO list