Text this: CO2 migration in saline aquifers. Part 2. Capillary and solubility trapping