Small fixes, debugging for complex graphs