update combat

fix some errors