Fix TODOs w/ Rob's feedback