more log fixes + fix #238