UML Diagrams Update

And some other stuff.