- Removed some dead code
 - Added some error handling
 - Fill in some missing data in match data structures
 - Fixed a defunct regexp for compacting spaces