fixed enviroment issues