Javadocs & rnd rewrite