fixing notification bugs
notification bugs fixed