WIP: make Plots hold a map.

Until Subdiagrams can be directly modified, need to keep them separate here.
clean up warnings
Sources.ZC.makeResult: fields in wrong order