#203 Remaining JavaDoc changes