Updating spec. General improvements