SM: CombatMovement improved (more to come)