more changes to TODOs