bugfixing
refinements to regexps