improved regexps. almost no MISSED cases