Some fixes; Progress on ordered displays of Teams