Various changes, additions, and removals of duplicates.