amos add ons
minor cleanups
more stuff
notifications updates