Updated comments, controller, adn supervisors