graph bug fixes
merged conflicts