standardizing javadoc comments, adding wiki links and diagrams, for and/then/when