Some changes, mostly to notation and wording in 3.1