big changes

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

big changes