Revert "try again - minor fixes for portfolio"

This reverts commit 90e4eee1863570e80f987170d2114e0c7bdb03e5.