Complete first pass.
In progress: second pass.
Minor fix.