Plotting tool -- some improvements