Saving crates rework

Fixed the few things we talked about.