Updated diagrams, more doc comments.