added rich notification
various minor tweaks