add class diagram and somes fixes