added notification, fixed bugs