diff --git a/app/js/websocket.js b/app/js/websocket.js
index bbeaafc..dc5b238 100644
--- a/app/js/websocket.js
+++ b/app/js/websocket.js
@@ -180,9 +180,13 @@ function initSocket() {
 
   socket.on('toastError', function(data) {
     // console.log("toast", data)
-    toast("<i class='fas fa-exclamation-triangle'></i> " + data, null, 2300, "bg-red fg-white");
+    // toast("<i class='fas fa-exclamation-triangle'></i> " + data, null, 2300, "bg-red fg-white");
+    Metro.dialog.create({
+      content: "<i class='fas fa-exclamation-triangle fg-red'></i>  " + data
+    });
     //
   });
+
   socket.on('toastSuccess', function(data) {
     console.log("toast", data)
     toast("<i class='fas fa-exclamation-triangle'></i> " + data, null, 2300, "bg-green fg-white");
diff --git a/index.js b/index.js
index c46bbdb..b0ae0c6 100644
--- a/index.js
+++ b/index.js
@@ -830,6 +830,12 @@ io.on("connection", function(socket) {
               var alarmCode = parseInt(data.split(':')[1]);
               console.log('ALARM: ' + alarmCode + ' - ' + grblStrings.alarms(alarmCode));
               status.comms.alarm = alarmCode + ' - ' + grblStrings.alarms(alarmCode)
+              var output = {
+                'command': '',
+                'response': 'ALARM: ' + alarmCode + ' - ' + grblStrings.alarms(alarmCode) + " [ " + command + " ]"
+              }
+              io.sockets.emit('data', output);
+              socket.emit("toastError", 'ALARM: ' + alarmCode + ' - ' + grblStrings.alarms(alarmCode) + " [ " + command + " ]")
               break;
             case 'smoothie':
               status.comms.alarm = data;
@@ -890,7 +896,7 @@ io.on("connection", function(socket) {
           command = command.replace(/(\r\n|\n|\r)/gm, "");
           // console.log("CMD: " + command + " / DATA RECV: " + data.replace(/(\r\n|\n|\r)/gm, ""));
 
-          if (command != "?" && command != "M105" && command != "$H" && data.length > 0) {
+          if (command != "?" && command != "M105" && data.length > 0) {
             var string = "";
             if (status.comms.sduploading) {
               string += "SD: "