corrected javadoc
corrected javadoc and upgraded versions