Logging and small cosmetic improvements.