Edits to 6.2.2 and 2.3.3
Edits through 6.3.1