Some more JavaDoc comments