Various diagrams fixes; implemented missing functions, required for presentation