Finish some TODOs