logging improved a bit