Changed loading/saving once again, should now be close to a final version