Improved notifications and fixed minor stuffs