Diagram cleanup and some validation of both model and XSD