updated and eliminated some TODOs
Updated and Eliminated TODOs