several fixes related to combat