Improving and fixes of notifications