big changes

Updates to a number of classes.
Merge pull request #5 from skunath/updates_portfolio

big changes