Some corrections on the UML diagram, thanks to Ivan