combat tweaks and charge attack fixed