Fixing regex bug.
Various additional filters and action hooks for use in other integrations.