typo correction and javadoc improvement