diff --git a/i80/pd.py b/i80/pd.py
index e61e2b8..e06b9e4 100644
--- a/i80/pd.py
+++ b/i80/pd.py
@@ -80,8 +80,8 @@ class Decoder(srd.Decoder):
     )
     annotations = (
         ('command', 'Command'),
-        ('write_data', 'Write'),
         ('read_data', 'Read'),
+        ('write_data', 'Write'),
         ('reset', 'Reset'),
         ('warnings', 'Warnings'),
     )
@@ -194,11 +194,9 @@ class Decoder(srd.Decoder):
                     
                 #cs off
                 elif self._data_is_cmd:
-                    #self.putd(self._data_begin, self.samplenum, [0, [self.format.format(self._data)]])
-                    self.putd(self._data_begin, self.samplenum, [1, [self.format.format(data)]])
+                    self.putd(self._data_begin, self.samplenum, [0, [self.format.format(self._data)]])
                 else:
-                    #self.putd(self._data_begin, self.samplenum, [1 if self._data_dir else 2, [self.format.format(self._data)]])
-                    self.putd(self._data_begin, self.samplenum, [0, [self.format.format(data)]])
+                    self.putd(self._data_begin, self.samplenum, [2 if self._data_dir else 1, [self.format.format(self._data)]])
 
             # check rst switch
             if operation[4] != self._last_operation[4]: