Updated regexs and removed some characters that were causing trouble