Improved saving, loading mechanism.