tweaks / bugfixes for graph