Removed some cruft
matchings now a dictionary.  broke highlighting.  oops.