more tweaks to the spec