A new system of saving and some fixes