updated and reorganized the todo list