fix to better deal with commas in names...