many minor updates and changes
Merge branch 'master' of https://github.com/JakubTN/amp