added some more group regexes
tidy up spaces
more code refactoring
fix some matches
Merge pull request #1054 from Bart39/dev

added/fixed some group regexes