Fix the javadoc highlighting.
Some javadoc improvements.