Patches and comments to Combatant class and combat function