final tweaks to notification enhancement changes