fix some TODOs