small tweaks, graph-model now ready to split up into data-model