new syntax for modifiers among other tweaks