fix logging, resilience