various updates to merging and tth