finishing some TODOs