Last adjustments; Java docs and comments