Fixed loading and saving, hacked around terrible shortcut stupid.