improved/fixed javadoc