Javadoc cleanup.
Javadoc and inheritance cleanup.