javadoc and some fix change