Add various changes to a few plotters and modules (sorry for vagueness...)