Changed logging messages and javadoc to match previous rev.