more minor changes to notification code