Some random small changes adn one regression fix