[PR] Various cleanups and text changes from latest merges

Two big things were merged today. A handful of text and other cleanups are needed.