Added combo portfolio. Tidied up data.