alarm router additions and fixes