Update report and javadoc