Cleanup, misc changes
Merge branch 'master' of https://github.com/molenzwiebel/MyPGM2