add and fix javadoc comments
add and fix javadoc comments