Updated diagrams, documentation and fixed #6