Added a bunch of small tweaks to TSCollection