Other improvements to enviroment