Simplifications.

Added verbose logging.