add comments adn small fixes