Loading and saving bugfix

Fixed more issues with loading and saving...