Minor javadoc and logging stuff