Improved user notifications and made small refactors