Reduced disk foot print and updated env_vars.sh