made changes to notification, fixed some bugs