Javadoc almost done