Did some clean up on the linking of people to new families