fix bug: using the same modifier twice can crash

Also fix special modifier names.