Latest code and results for plot3 - minor cleanup