More graph tweaks