Updated a few regexes for accuracy