Some updates to spec.