Added more object oriented plot handing to plot_fit