Personality fixes

I still need to handle avatars properly.