added/fixed some group regexes