prevent double join. fix affiliation typo