improvements in logging