logging, etc tweaks