Fixes and cleans up graph generation.

We need to define cluster elements in the cluster, then provide the mappings later