Gameplay Update
Merge master -> Jens [fixed]