Numerous fixes + proper FX correlations now