Add missing underlines.
Small adjustments to javadoc.