Javadoc and minor adjustments