moar logging improvement