Add a bit more javadoc and logs.