minor improvements in logging