some tweaks to value streams