Graph bug fix; tweaks