changes for environment variables
fixes