edits to chp2 including cleaning