Gameplay and Fun tweaks.
Merge remote-tracking branch 'origin/0.1' into 0.1