updated javadoc, sorry about lateness