added notifications, minor adjustments