Diagrams and other minor changes