[Issue 179] [WIP] fixes UML mistakes