Fixed some things on the todo list