address more TODOs