some improvements for notifications