Lots of notifications improvements