Notification add and some bugs fix