Numerous changes and additional notes following on from plenary discussion