added regexes, minor fixes