Notifications email and Other changes