updated some TODOs"