more notification fixes.  Closes #582.