Make the --self-contained option work for generated images.
Allow replacing axis labels (as opposed to adding more labels)