Did some changes to alarm and email.