Updated some TODOs

updated some TODOs along with adding other TODOs
March 31 2014 15:16