More work on the plotting scripts