notification message improvements