[issue #176 #170 #169] [UML] fixes the uml and add them