Added enum to UML, changed a couple of things