minor changes, javadoc updates