javadoc, small various touchups