Added Notification and checks and alerts
Fixed bugs