tested save & load + corrections