More work on sleeping zones, fire fixes from master branch.