Misc tweaks.
Merge branch 'v0.4' of https://github.com/ZPZ-Gr2/AwesomeGameInSpace into v0.4