More work on a lot of functions. Need to think more about how statistics display should work.