Updated the TODO list
Minor changes to the comments