Changed some things to make the save process a little more complete.