Proofreading changes

Work in progress... don't merge.