trying to fix notification bugs