graph / bug fixes