Update comments

neo/client/transactions.py

@@ -117,10 +117,11 @@ class Transaction(object):
             return
         if lockless:
             if lockless != serial: # late lockless write
+                # Oops! We shouldn't have executed the above 'remove'. Readd.
                 assert lockless < serial, (lockless, serial)
                 uuid_list.append(uuid)
                 return
-            # It's safe to do this after the above excepts: either the cell is
+            # It's safe to do this after the above except: either the cell is
             # already marked as lockless or the node will be reported as failed.
             lockless = self.lockless_dict
             if not lockless:

neo/tests/threaded/test.py

@@ -345,7 +345,6 @@ class Test(NEOThreadedTest):
             [DelayEvent, DelayEvent, ConflictError, ConflictError])
 
     def testDeadlockAvoidance(self):
-        # This test fail because deadlock avoidance is not fully implemented.
         # 0: C1 -> S1
         # 1: C2 -> S1, S2 (delayed)
         # 2: C1 -> S2 (deadlock)
@@ -2653,7 +2652,7 @@ class Test(NEOThreadedTest):
         work in itself, the code was hazardous and the client can't easily
         discard such "positive" answers, or process them early enough.
 
-        The scenario focuses on transaction t1 (storing object A)
+        The scenario focuses on transaction t1 (storing oid 1)
         and node s1 (initially replicating the only partition):
         1. t1 stores: conflict on s0, lockless write on s1
         2. t2 stores: locked on s0, lockless write on s1