minor fixes, completed modifiers code