merged fixed plotter from skills-branch