Some updates.
Merge conflict on timestamp handling resolved.