domain model example, clear diagram and other fixes