minor changes + UML