further logging imrpovements