[update:] minor changes in java