fixed some regexps