fix save/load issues
minor fixes