some fixes with uml diagram