some more TODOs squashed