improved notifications and notification e-mail messages