added/updated some groups/regex