More javadoc and logging cleanup