Adding the notification deletion and other little changes