updated logging etc