fixes to underlying graph format