Regex repair,etc