clarified some TODO items