Changed Player nomenclature to Avatar
Deep cleanup