More descriptive logging.  fixes #1