Fixed a bunch of saving bugs