Make further improvements to the spec