partial copyedit commit
Fix more line overflows
Merge branch 'atlas-master'