Rewrite some javadocs