minor changes + class diagram