adjust environment defaults
fix merge