sort out some TODOs