Fixing exchange rates, adding market stuff