More editing

Lot's of duplicate entries, formatting errors, and some of questionable validity and taste.