removed some print statemeents
removed unneeded TODOs
added more comments