Notes and improvements from consultation.