made regexps slightly more restrictive