fixed a save-restore issue and improved u i