Fixed up the graphs a whole lot!