Some updates and bug fixes to make the single sweep plotter working again.