Adding the Email Service challenge and minor edits