fixes to source files for code remove in regex replace
repairs to good code blown away by regex