- fixed regexps a bit