improve notification messages