More changes to psdCalc and psdPlot