javadoc and logging improvements