Saving - fixed minor bugs