added notifications and general better-ness