Changed to new naming scheme for histograms, added functionality to the analysis...