Bug  fixes, notification improvements