Minor changes to entry and plotter.