Sponsors 95% complete. Fix sorting in many places