moved some more environment variables over