Saving and Loading improvement, plus bug fixes