some more tweaking to notifications