fix for notifications and more logging