More diagrams, some minor grammar modifications