Various improvements on stocks and collections