more support for multi-output labels and colours, rename params for clarity