logging improvemens