Minor updates (logging, javadoc, ...)