save refactored, few hot keys side effects corrected