update regexes to capture more widely