add plot_samples, make it default for diagnostics