Updated javadoc (to current WIP)