Improved 2-D correlation; binning scheme changed to be (s,theta)