collection mode tweaks to allow for more control