Added more verbose and accurate log statements