Clean up comments, added 'Email' field back to Invigilator.