final update to javadocs and UML