Update TO DO.
Fix loop comment and remove debugging cruft.