edits from manfred
Merge branch 'client-copy-edits'