issue #796 fixed + bugfix to graph display