Update UML diagram.
Fix some errors from last merge.