some more TODOs done