improved NotificationService, added more documentation