Better stock-portfolio, a few tweaks