bug fixes and change to notification behavior