Fixes as suggested by Sandra
Fixes to graphs 3.2, 3.10, 3.11