Comments by @drotaru addressed plus a couple of minor fixes in debug logs on the way