Added more verbose logging