diff --git a/tunerlistd/buttondecoder.py b/tunerlistd/buttondecoder.py
index 45e1df4..a92a04e 100644
--- a/tunerlistd/buttondecoder.py
+++ b/tunerlistd/buttondecoder.py
@@ -35,12 +35,12 @@ class ButtonEvent:
                 return
             thread_sleep(0.001)
         self.long_press = True
-    
+
     def __repr__(self):
         return str(self)
-    
+
     def __str__(self):
-        return f"{self.button} {self.state}"
+        return self.button + " LONG PRESS" if self.long_press else ""
 
 class ButtonDecoder:
     def __init__(self, pi):
@@ -75,10 +75,11 @@ class ButtonDecoder:
                     btnev = ButtonEvent(btn)
                     self.pending_buttons[line[0]][line[1]] = btnev
                     future = self.executor.submit(btnev.wait_for_longpress)
-                    future.add_done_callback(lambda: self.queue.put_nowait(btn))
+                    future.add_done_callback(lambda _: self.queue.put_nowait(btnev))
                 else:
                     btnev = self.pending_buttons[line[0]][line[1]]
-                    btnev.event.set()
+                    if btnev:
+                        btnev.event.set()
         except Exception as e:
             print(e)
 
diff --git a/tunerlistd/main.py b/tunerlistd/main.py
index a7efd98..f87d792 100644
--- a/tunerlistd/main.py
+++ b/tunerlistd/main.py
@@ -113,7 +113,7 @@ async def button_listener():
             btn = button.button if not button.long_press else f"{button.button}_LP"
             if btn in BUTTON_MAPPINGS:
                 try:
-                    func, arg = BUTTON_MAPPINGS[button.button]
+                    func, arg = BUTTON_MAPPINGS[btn]
                     func(arg)
                 except Exception as e:
                     print(e)
@@ -165,7 +165,7 @@ async def websocket_endpoint(websocket: WebSocket):
     try:
         while True:
             payload = await queue.get()
-            print(payload)
+#            print(payload)
             await websocket.send_text(dumps(payload))
     except CancelledError:
         return
@@ -186,11 +186,5 @@ async def connect_aa(request: Request):
     queue.put_nowait({"wireless_aa_ip": ip})
     return ip
 
-@app.get("/aabtn", response_class=PlainTextResponse)
-async def aabtn(request: Request):
-    btn = request.query_params.get("btn")
-    queue.put_nowait({"button": {"btn": btn, "state": 2}})
-    return btn
-
 if __name__ == "__main__":
     run(app=app, host="0.0.0.0", port=5959, log_level="info", )
diff --git a/tunerlistd/tunerlist.py b/tunerlistd/tunerlist.py
index 4ad3b0b..c5452fb 100644
--- a/tunerlistd/tunerlist.py
+++ b/tunerlistd/tunerlist.py
@@ -4,7 +4,7 @@ from time import sleep as thread_sleep
 import re
 
 BAUD_RATE = 9600
-PORT = "/dev/ttyAMA2"
+PORT = "/dev/ttyUSB0"
 DEBUG = True
 
 fadePattern = re.compile(r"\d F \d")
@@ -91,11 +91,9 @@ class TunerList:
         except Exception as e:
             print(e)
             txt = ""
-            for i in range(7, 11):
-                try:
-                    txt += line[i].decode("ascii")
-                except:
-                    txt += hex(line[i])[2:]
+            start = (6 if line[0] == 0x90 else 10)
+            for i in line[start: start+4]:
+                txt += hex(i)[2:]
                 txt += " "
             self.text = txt
         finally:
@@ -146,4 +144,4 @@ if __name__ == "__main__":
             except KeyError:
                 pass
     get_event_loop().run_until_complete(main())
-    
\ No newline at end of file
+