Updated Todo list
Cleaned up comments