More diagrams improvements