reviewed some TODO items