minor fixes, javadoc updated