Attempt to resolve second item in issue #48

See three comments flagged with QQQ (uncomment to add one more data
point)
Some logging added.
Some unrelated redundant code removed.
Expired comments removed.