More logs and better notification