Integrated Zurek's edits, but it's changed a fair bit since then
Fix spelling in tables, minor tweaks