NB: Gavin, I combined activeGraphName/graph into a retained instance of GeneratedGraphInfo (activeGraph), which retains both + label now. The instance is added to 'graphs' in endGraph() -  please check.