Some javadoc and other comments