a couple more regexes