handle some TODOs