Fix e-mail format, and the extra comma