Doc corrections, plus style tweaks