Tightened up some more of the specs, added missing info.