Regexps modifed, and few changes