More plotting/labelling tweaks