and finally update javadoc!