Updates to regexes and fixes for regions.