Updates to how we plot, and generate (nevents)