Updated some regex and other things