moved comments around, fixed commas