+ Bug fixes to regex