minor cleanup of email address, and inline comments