finish some TODOs