Progress in the measurement of salinity and oxygen at the Woods Hole Oceanographic Institution