fix javadocs and comments to match