Updating the specs to fix some bugs in the spec