log fixes / improvements