Javadoc and final corrections