logging improved.