javadoc, cleanup, new uml