some updates adn fix
some updates adn fix