Notifications now work almost properly