comment and email bug fixes