Made a few changes to the todo.