Small Fixes To Gameplay
Merge branch 'fine-tune-controls'