class diagrams fixes