-comments updated
-entities modified by class diagram
-some minor changes