In plot set 3, support a single dataset
a few more changes which help support single-dataset plotting