Removing some more comments, as well as the completed TODO’s and NSLog feedback lines
Added some more TODO’s