fixed bugs in notifications