Started working over javadocs a bit more, will come back to this.