changes in plotting functions. IN/OUT now more homogeneous