Fixed a few things in the todo list