Notifications and some tweaks