Corrected handling of modifiers
Updated legends