groom/complete some TODOs