Many misc updates adn improvements