fixes + load + save