changing a couple regexes for flexibility