Reorganized parser dictionary, fixed a few regex strings