started making graph, plus minior tweaks else where