Cleaned up plots, renamed p# -> s# so that it doesn't conflict with SimpleLineplot.R