A bit of javadoc and minor change