Several updates to the specification