minor fixes, preparing for portfolio-selection transition