fix for UML

also some fix in code to match UML