Add more checking and changes for annoying WD sleep issues.