minor improvements to environment