Cleaned up combatant collisions a little