javadoc additions and corrections