Edits

... including getting rid of CH-