diff --git a/assignment-client/src/entities/EntityPriorityQueue.h b/assignment-client/src/entities/EntityPriorityQueue.h
index 730e08591e..9210ac549f 100644
--- a/assignment-client/src/entities/EntityPriorityQueue.h
+++ b/assignment-client/src/entities/EntityPriorityQueue.h
@@ -22,7 +22,7 @@
 const float SQRT_TWO_OVER_TWO = 0.7071067811865f;
 const float DEFAULT_VIEW_RADIUS = 10.0f;
 
-// ConicalView is an approximation of a ViewFrustum for fast calculation of sort priority.
+// ConicalViewFrustum is an approximation of a ViewFrustum for fast calculation of sort priority.
 class ConicalViewFrustum {
 public:
     ConicalViewFrustum() {}
@@ -37,6 +37,7 @@ private:
     float _radius { DEFAULT_VIEW_RADIUS };
 };
 
+// Simple wrapper around a set of conical view frustums
 class ConicalView {
 public:
     ConicalView() {}
@@ -113,7 +114,7 @@ private:
                                               PrioritizedEntity::Compare>;
 
     PriorityQueue _queue;
-    // Keep dictionary of al the entities in the queue for fast contain checks.
+    // Keep dictionary of all the entities in the queue for fast contain checks.
     std::unordered_set<const EntityItem*> _entities;
 
 };
diff --git a/assignment-client/src/entities/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp
index ae7de01c3e..2e57f2e00f 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.cpp
+++ b/assignment-client/src/entities/EntityTreeSendThread.cpp
@@ -138,7 +138,6 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
                 if (entity) {
                     float priority = PrioritizedEntity::DO_NOT_SEND;
 
-
                     if (forceRemove) {
                         priority = PrioritizedEntity::FORCE_REMOVE;
                     } else {
@@ -154,7 +153,6 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
                         }
                     }
 
-
                     if (priority != PrioritizedEntity::DO_NOT_SEND) {
                         _sendQueue.emplace(entity, priority, forceRemove);
                     }
@@ -305,7 +303,8 @@ void EntityTreeSendThread::startNewTraversal(const DiffTraversal::View& view, En
                             } else {
                                 priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
                             }
-                        } else if (entity->getLastEdited() > knownTimestamp->second) {
+                        } else if (entity->getLastEdited() > knownTimestamp->second ||
+                                   entity->getLastChangedOnServer() > knownTimestamp->second) {
                             // it is known and it changed --> put it on the queue with any priority
                             // TODO: sort these correctly
                             priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
@@ -339,15 +338,13 @@ void EntityTreeSendThread::startNewTraversal(const DiffTraversal::View& view, En
                             // See the DiffTraversal::First case for an explanation of the "entity is too small" check
                             if ((next.intersection == ViewFrustum::INSIDE || view.intersects(cube)) &&
                                 view.isBigEnough(cube)) {
-                                    // If this entity wasn't in the last view or
-                                    // If this entity was skipped last time because it was too small, we still need to send it
                                     priority = _conicalView.computePriority(cube);
                             }
                         } else {
                             priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
                         }
-                    } else if (entity->getLastEdited() > knownTimestamp->second
-                            || entity->getLastChangedOnServer() > knownTimestamp->second) {
+                    } else if (entity->getLastEdited() > knownTimestamp->second ||
+                               entity->getLastChangedOnServer() > knownTimestamp->second) {
                         // it is known and it changed --> put it on the queue with any priority
                         // TODO: sort these correctly
                         priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
diff --git a/libraries/entities/src/DiffTraversal.cpp b/libraries/entities/src/DiffTraversal.cpp
index d5f2273fd5..39328e11ad 100644
--- a/libraries/entities/src/DiffTraversal.cpp
+++ b/libraries/entities/src/DiffTraversal.cpp
@@ -221,7 +221,7 @@ DiffTraversal::Type DiffTraversal::prepareNewTraversal(const DiffTraversal::View
     //
     //   _getNextVisibleElementCallback = identifies elements that need to be traversed,
     //        updates VisibleElement ref argument with pointer-to-element and view-intersection
-    //        (INSIDE, INTERSECtT, or OUTSIDE)
+    //        (INSIDE, INTERSECT, or OUTSIDE)
     //
     // external code should update the _scanElementCallback after calling prepareNewTraversal
     //