Updated Diagrams, some bugfixes and Updated document.