and fix the commas