Fixed combat positioning
Surrendering, combat target changes