update to 'env' param, replacing ams and ips
Merge pull request #136 from lbondaryk/new_amc_and_paf_fixes

update to 'env' param, replacing ams and ips