Some javadoc improvement and review