Updates

Contains small updates and UML diagrams.