loads of logging changes... and other changes.. and more changes..