Small changes
JavaDoc additions/changes