component and activity diagrams, minor changes