UMLs finished

Also some miscellaneous changes.