Docblock tweaks / minor logging improvements