various modifications
Merge branch 'master' of https://github.com/CAG12/ambrosia2