Many changes, mostly before section 1.2