editorial changes, more style tuning