Working on some fixes / changes to notifications