[Issue 188] [WIP] fixes UML mistakes