doc + somes modifications to fit the new uml diagrams