escape comma in subs & some reformat