Changes to have 'region' in composite country for argentina scenario and changes to trade stuff so trade parameters change over time period. Plus other tweaks.