Small refactorings and adding some more diagrams.