various changes in logging