minor improvements, java-doc update