javadoc and uml added