javadoc + some fix