updated some small things
Merge branch 'master' of https://github.com/David1209/AMR