Are all these changes in plot.F90 from testing/debugging?  Should be cleaned up.