Saving and minor fixes