some new javadoc and changes