Some javadoc / check improvements