javadoc + some modifies