add separate diagnostic plots
tidy up a bit