more TODO items and small fix