moved environment hacks to environment script!