Done with first cut of integrating editing comments.