regexes simplified; new browsers added