Updated most of the plotting functions