Added and removed some comments on ToDo list