small changes regards to logging