User: Changed some histograms; cleaned very messy code