fix some more TODOs