some more tweaks on environment