Small changes to code and Javadoc.