[Issue 85] [WIP] fixes UML mistakes