Improved some of the specs.