fixed up some regex