Notifications and bug fixes