Minor tweaks and updates to the latest version of Amon2

Except for the big MyApp commit, those should be pretty straight-forward.

Let me know if you think I broke something, I'd happily rework my patch.