Fix some stuff and clean up avatars