Diagram update

Diagram update
plus scrub notes