Fixed Gameplay bugs