Removed default email handling and typos