Javadoc improvements

Since the CI build now builds javadocs, it has become apparent that
there were issues in the existing Javadocs.  This commit cleans those
problems up.
Merge branch 'javadoc'