working on regex for replace, fixed r+