This fixes multiple issues, mainly cleaning up the patch as well as making save-all actually save all. (Worth noting, that you should probably be using save-all flush if you're relying on this for backups)