cleanup new save/load a bit -- still not ready though