Update javadocs
more fixes