Multiple changes

New location logic for two sets of pronouns. Add Contessa fix to new instance.