notification fixes and improvements