Add Notifications and Small Fixes