several enhancements to graph