more javadocs, better javadocs