class diagramm up
clean up, add some validation