added emails to comments and logic to choose email or not