Fixing issues and better alert of time save