Fix remaining in-text xxx markers
Start final edits on ch 4