stream template tweaks