mostly logging tweaks