add and fix notifications