Graph & bugfixes