Some TODO tweaks.
More docs on object diffing.