timeout increased and logging improved