small changes to notifications
merge