Minor tweaks, passes all graph tests