Updating javadoc, should have gone in last commit