logger improvement & integration