added new version of diagrams, minor ajustments