fixed some things
Merge pull request #187 from aimzatron/master

Changed portfolio