fixed some regexs