minor uml refinements + updated classes to match class diagram