zEventd improvenments

These are ADDITIONS to the #2085 pull request.