Updated the todo lists and some comments