Javadoc improvements, part 2