fixed some regexes