added plotter and formatting improvements