Better logging & restart works