Logging changes.
More logging.
More logging.
build changes and refactoring.