minor logging work, cleanup