Cosmetic improvements, more logging