graph v2 - minor bug fixes