Merge pull request #681 from awolfs/master

amsterdam updates
more ams updates