Fixed up regexes.