more portfolio/margin changes