Some cosmetic changes, plus now we're saving portrait data with the
character.