Updated to fix some combat issues