javadoc and message improved