Fix and finish Notifications