More un-merged changes. Save WC plots in batch mode.