Logging...improvements. & changes from PR #49