updated some TODOs