javadoc changes to correspond with recent method changes
more javadoc changes to correspond with recent method changes