bugfix
almost fixed graphs'
merge