more progress on fixing notifications.