Updated the diagrams & moved some content around.