more work on modifiers, fixed bugs, change cfg