more ams updates
date fixed
Merge pull request #682 from awolfs/master

more ams updates