some more TODO items cleared