General edit and clarification pass.