more $ENV changes

some are left out