Some gameplay tweaks
Merge branch 'Gameplay'