Some JavaDoc additions