General updates. Resolving merger discrepancies.