some regexes were a little aggressive