Some more work on logging output