Note that javadoc improvements are in progress