added notifications collection and pubs/subs
LOTS of bug fixes from not testing earlier versions