Committing VisualParadigm UML file, minor code tweaks.