bug fixes for notifcation stuff