Diagrams and misc updates