fixed a couple of notification bugs