A few tweaks, but haven't checked logging...