logging work and other improvements