More work on the plot script and uncommitted changes from yesterday.