added some more regexes