Added group variability and various display improvements