More UML Tweaks