speed up graph generation review fixes 4