Mainly add and make correction to the javadoc.