diff --git a/Sccp_manager.inc/aminterface/Event.class.php b/Sccp_manager.inc/aminterface/Event.class.php
index 585fc74..640ffd5 100644
--- a/Sccp_manager.inc/aminterface/Event.class.php
+++ b/Sccp_manager.inc/aminterface/Event.class.php
@@ -35,7 +35,7 @@ class UnknownEvent extends Event
 {
     public function __construct($rawContent = '')
     {
-        print_r($rawContent);
+//        print_r($rawContent);
 //        die();
     }
 }
@@ -110,7 +110,7 @@ class ExtensionStatus_Event extends Event
 
 class SCCPDeviceEntry_Event extends Event
 {
-    
+
 }
 
 class SCCPShowDeviceComplete_Event extends Event
@@ -165,7 +165,14 @@ class SCCPShowDevicesComplete_Event extends Event
 class SCCPDeviceButtonEntry_Event extends Event
 {
 }
-
+class SCCPDeviceFeatureEntry_Event extends Event
+{
+// Returned by SCCPShowDevice
+}
+class SCCPVariableEntry_Event extends Event
+{
+// Returned by SCCPShowDevice
+}
 class SCCPDeviceLineEntry_Event extends Event
 {
 }
@@ -177,5 +184,5 @@ class SCCPDeviceSpeeddialEntry_Event extends Event
 }
 class ExtensionStateListComplete_Event extends Event
 {
-    
+
 }
diff --git a/Sccp_manager.inc/aminterface/Response.class.php b/Sccp_manager.inc/aminterface/Response.class.php
index ad6dedc..1a00df0 100644
--- a/Sccp_manager.inc/aminterface/Response.class.php
+++ b/Sccp_manager.inc/aminterface/Response.class.php
@@ -434,10 +434,10 @@ class SCCPShowDevice_Response extends SCCPGeneric_Response
     }
     public function getResult()
     {
+        // This object has a list of events _events, and a list of tables _tables.
         $result = array();
 
         foreach ($this->_events as $trow) {
-          dbug('keys are',$trow->getKeys());
                 $result = array_merge($result, $trow->getKeys());
         }
         $result['Buttons'] = $this->ConvertTableData(
@@ -448,7 +448,7 @@ class SCCPShowDevice_Response extends SCCPGeneric_Response
                   )
         );
         $result['SpeeddialButtons'] = $this->ConvertTableData(
-            'Buttons',
+            'SpeeddialButtons',
             array('id'),
             array('id'=>'id','channelobjecttype'=>'channelobjecttype','name'=>'name','number'=>'number','hint'=>'hint')
         );