notification settings changes plus small changes
Merge branch 'master' of https://github.com/tommyadey/aries

pull changes