Rework substitution detection paragraph, and figure