several javadocs and comment corrections