Updates from Ari's edits and consistency checks.