Revise some more of the buying/saving code

Still trying to fix the saving / buying bug but I think that I know that
all of these bugs have one root . I think it is in the saving or loading
code