Vocabulary improvements and email addresses