minor changes, javadoc