A few more general javadocs