fixed some modifiers