frame for the graph added
merged
some minor bugs solved after conflicts resolutions