+ Fixes to catch some edge cases that had been missed.
+ Tidy up of regex group names.