simplified logging, and javadoc corrections