Bug fix + Gameplay tweak