more on diffs & logs, a bit of reorganization