Add comments and email sending functionality