javadoc corrected and completed