TODO and Comments
* Updated TODO list
* Updated comments