added/updated some groups/regex
Merge pull request #1057 from Bart39/dev

added/updated some groups/regex