- more regexs tweaking