Fixed some UML Criticism