Logging cleanup; extra logging detail (for #4)