Revert "Revert "Some pretty awesome fire/airalarm fixes""

This reverts commit 2ec7b67db60eb870c0cef27b44960c91ea113aa2.