More work on alarm and arm events