Updated the todo's