Even more UML progress