big tweaks to collection controls