made coughing from smoke wake you up
Merge some sleep fixes.