improvements: more strict regexps