Fixes adn improoves