some more TODOs