Learner cleaned up, plotter added